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

Caolán McNamara caolanm at redhat.com
Thu Jan 25 08:56:23 UTC 2018


 vcl/source/window/seleng.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4158cbabd6587431c89f288abea6080947d9f421
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 24 17:32:25 2018 +0000

    why set CMDEVT on flags for unhandled commands
    
    Change-Id: I565e26ad01310cc05707123f4d42e24c77838793
    Reviewed-on: https://gerrit.libreoffice.org/48530
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index c545824436cd..b35576ee1bf1 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -342,12 +342,12 @@ void SelectionEngine::Reset()
 void SelectionEngine::Command( const CommandEvent& rCEvt )
 {
     // Timer aWTimer is active during enlarging a selection
-    if ( !pFunctionSet || !pWin || aWTimer.IsActive() || rCEvt.GetCommand() == CommandEventId::Swipe )
+    if ( !pFunctionSet || !pWin || aWTimer.IsActive() )
         return;
     aWTimer.Stop();
-    nFlags |= SelectionEngineFlags::CMDEVT;
     if ( rCEvt.GetCommand() == CommandEventId::StartDrag )
     {
+        nFlags |= SelectionEngineFlags::CMDEVT;
         if ( nFlags & SelectionEngineFlags::DRG_ENAB )
         {
             SAL_WARN_IF( !rCEvt.IsMouseEvent(), "vcl", "STARTDRAG: Not a MouseEvent" );


More information about the Libreoffice-commits mailing list