summaryrefslogtreecommitdiff
path: root/svtools/source
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source')
-rw-r--r--svtools/source/contnr/imivctl.hxx9
-rw-r--r--svtools/source/contnr/imivctl1.cxx5
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)
{