[Libreoffice-commits] core.git: svtools/source

[Libreoffice Gerrit user]

 svtools/source/contnr/imivctl.hxx  |    9 ++++-----
 svtools/source/contnr/imivctl1.cxx |    5 -----
 2 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit a77c2083a4e4525062a4c005cb6491c4e3278225
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Nov 30 09:28:57 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Nov 30 11:20:04 2018 +0100

    remove unused IconChoiceFlags::StartEditTimerInMouseUp
    
    Change-Id: I157f455880095a0ee8a609028838b399eb26238a
    Reviewed-on: https://gerrit.libreoffice.org/64320
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index 52f73e7b6802..d81044043bca 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -54,13 +54,12 @@ enum class IconChoiceFlags {
     SelectingRect                = 0x0002,
     DownCtrl                     = 0x0004,
     DownDeselect                 = 0x0008,
-    StartEditTimerInMouseUp      = 0x0010,
-    EntryListPosValid            = 0x0020,
-    ClearingSelection            = 0x0040,
-    Arranging                    = 0x0080
+    EntryListPosValid            = 0x0010,
+    ClearingSelection            = 0x0020,
+    Arranging                    = 0x0040
 };
 namespace o3tl {
-    template<> struct typed_flags<IconChoiceFlags> : is_typed_flags<IconChoiceFlags, 0x00ff> {};
+    template<> struct typed_flags<IconChoiceFlags> : is_typed_flags<IconChoiceFlags, 0x007f> {};
 }
 
 // unit = pixels
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 2d2269b492e5..3e46890ad38c 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -815,11 +815,6 @@ bool SvxIconChoiceCtrl_Impl::MouseButtonUp( const MouseEvent& rMEvt )
     }
 
     nFlags &= ~IconChoiceFlags(IconChoiceFlags::DownCtrl | IconChoiceFlags::DownDeselect);
-    if( nFlags & IconChoiceFlags::StartEditTimerInMouseUp )
-    {
-        bHandled = true;
-        nFlags &= ~IconChoiceFlags::StartEditTimerInMouseUp;
-    }
 
     if((nWinBits & WB_HIGHLIGHTFRAME) && bHighlightFramePressed && pCurHighlightFrame)
     {