[Libreoffice-commits] core.git: include/vcl vcl/source

[Stephan Bergmann]

 include/vcl/toolbox.hxx        |    1 -
 vcl/source/window/toolbox.cxx  |    4 +---
 vcl/source/window/toolbox2.cxx |    2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 3c9b1306384cc88d7afbfe3127ea40ba056a4822
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Tue Mar 14 14:19:20 2017 +0100

    ToolBox::mbCommandDrag is always false now
    
    ...after 5ac443e180c54dee69a65a1569c99afe151f2f97 "ToolBox::mbCustomizeMode 
is
    always false"
    
    Change-Id: I39bd9d07dfd8dee8e935aa612db35e11022f4ed3

diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 3c4066e..17c31cb 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 3d619b7..02f8ee4 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 c3245b7..b2d708d 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits