[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source

[Szymon Kłos (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit e4a8da70bba81da70f3540dce83409ff9d00ea23
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Apr 16 10:26:34 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Sep 26 16:03:27 2019 +0200

    Fix range selection in chart wizard for online
    
    In the Online when range was selected in second
    step of the Chart Wizard, main window become
    unresponsive. This fix blocks doubled MouseButtonUp
    event and allows to fold/unfold multiple times the
    range selection dialog by allowing to use that window
    type in SetRefDialog.
    
    Change-Id: I9f64cf7a110ab9264bc53dd740f0caf576764714
    Reviewed-on: https://gerrit.libreoffice.org/79570
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/79608
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c8486ab80dd8..6977de2cc9cc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2648,11 +2648,14 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt )
     }
     else if ( rTEvt.IsTrackingEnded() )
     {
-        // MouseButtonUp always with matching buttons (eg for test tool, # 63148 #)
-        // The tracking event will indicate if it was completed and not canceled.
-        MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
-                            rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier() );
-        MouseButtonUp( aUpEvt );
+        if ( !comphelper::LibreOfficeKit::isActive() )
+        {
+            // MouseButtonUp always with matching buttons (eg for test tool, # 63148 #)
+            // The tracking event will indicate if it was completed and not canceled.
+            MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
+                                rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier() );
+            MouseButtonUp( aUpEvt );
+        }
     }
     else
         MouseMove( rMEvt );