diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-30 09:28:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-30 11:20:04 +0100 |
| commit | a77c2083a4e4525062a4c005cb6491c4e3278225 (patch) | |
| tree | 1bbb40c6ba4f296874a983ee00cb11bcbe027460 /svtools | |
| parent | 9059457a1a8385cb80b5dd2c797cee77af4222a9 (diff) | |
remove unused IconChoiceFlags::StartEditTimerInMouseUp
Change-Id: I157f455880095a0ee8a609028838b399eb26238a
Reviewed-on: https://gerrit.libreoffice.org/64320
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/contnr/imivctl.hxx | 9 | ||||
| -rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 5 |
2 files changed, 4 insertions, 10 deletions
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) { |