diff options
| -rw-r--r-- | include/vcl/toolbox.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/toolbox.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 3c4066e7cb66..17c31cbda733 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -137,7 +137,6 @@ private: sal_uInt16 mnMouseModifier; bool mbDrag:1, mbSelection:1, - mbCommandDrag:1, mbUpper:1, mbLower:1, mbIn:1, diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 3d619b7ea343..02f8ee4e2519 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1325,7 +1325,6 @@ void ToolBox::ImplInitToolBoxData() mnMouseModifier = 0; mbDrag = false; mbSelection = false; - mbCommandDrag = false; mbUpper = false; mbLower = false; mbIn = false; @@ -3902,13 +3901,12 @@ void ToolBox::MouseButtonUp( const MouseEvent& rMEvt ) if ( ImplHandleMouseButtonUp( rMEvt ) ) return; - if ( mbDragging && (rMEvt.IsLeft() || mbCommandDrag) ) + if ( mbDragging && rMEvt.IsLeft() ) { ImplTBDragMgr* pMgr = ImplGetTBDragMgr(); pMgr->EndDragging(); return; } - mbCommandDrag = false; DockingWindow::MouseButtonUp( rMEvt ); } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c3245b71b338..b2d708dfbb32 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1134,8 +1134,6 @@ void ToolBox::StartSelection() void ToolBox::EndSelection() { - mbCommandDrag = false; - if ( mbDrag || mbSelection ) { // reset |