[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - 3 commits - svx/source vcl/source

[Tomaž Vajngerl (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx    |    7 ++++++-
 vcl/source/control/listctrl.cxx  |   10 ++++++++--
 vcl/source/edit/vclmedit.cxx     |    8 +++++---
 vcl/source/treelist/svimpbox.cxx |   10 ++++++----
 vcl/source/window/winproc.cxx    |    6 ++++++
 5 files changed, 31 insertions(+), 10 deletions(-)

New commits:
commit 74456219dc5c5716c023d69abc7ad6f7d90b4a33
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Jun 15 15:44:33 2019 +0900
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 17 15:08:37 2019 +0200

    tdf#124907 vcl: react to pan gesture for listbox and other widgets
    
    Reviewed-on: https://gerrit.libreoffice.org/74087
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 08f485c6e92bd56c8c26171316b842cd213a8a09)
    
    Change-Id: I4579f8edd2bf24506b1d55a7291cd86e276f30a4
    Reviewed-on: https://gerrit.libreoffice.org/74164
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/control/listctrl.cxx b/vcl/source/control/listctrl.cxx
index 50b03eddc918..62f6a1dbc90a 100644
--- a/vcl/source/control/listctrl.cxx
+++ b/vcl/source/control/listctrl.cxx
@@ -158,9 +158,15 @@ bool ListControl::EventNotify( NotifyEvent& rNEvt )
     if (rNEvt.GetType() == MouseNotifyEvent::COMMAND)
     {
         const CommandEvent* pEvent = rNEvt.GetCommandEvent();
-        if (pEvent && pEvent->GetCommand() == CommandEventId::Wheel)
+        if (pEvent)
         {
-            HandleScrollCommand(*pEvent, nullptr, mpScrollBar.get());
+            CommandEventId nCommand = pEvent->GetCommand();
+
+            if (nCommand == CommandEventId::Wheel ||
+                nCommand == CommandEventId::Gesture)
+            {
+                HandleScrollCommand(*pEvent, nullptr, mpScrollBar.get());
+            }
         }
     }
     return true;
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 759bef4e6a68..66eadf02c28d 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -693,9 +693,11 @@ void ImpVclMEdit::Enable( bool bEnable )
 bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt )
 {
     bool bDone = false;
-    if ( ( rCEvt.GetCommand() == CommandEventId::Wheel ) ||
-         ( rCEvt.GetCommand() == CommandEventId::StartAutoScroll ) ||
-         ( rCEvt.GetCommand() == CommandEventId::AutoScroll ) )
+    CommandEventId nCommand = rCEvt.GetCommand();
+    if (nCommand == CommandEventId::Wheel ||
+        nCommand == CommandEventId::StartAutoScroll ||
+        nCommand == CommandEventId::AutoScroll ||
+        nCommand == CommandEventId::Gesture)
     {
         (void)mpTextWindow->HandleScrollCommand( rCEvt, mpHScrollBar, mpVScrollBar );
         bDone = true;
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index be0ccf735446..e7d4370c7365 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2850,10 +2850,12 @@ void SvImpLBox::Command(const CommandEvent& rCEvt)
         aEditIdle.Stop();
 
     // scroll mouse event?
-    if (((nCommand == CommandEventId::Wheel) || (nCommand == CommandEventId::StartAutoScroll)
-         || (nCommand == CommandEventId::AutoScroll))
-        && pView->HandleScrollCommand(rCEvt, aHorSBar.get(), aVerSBar.get()))
-        return;
+    if (nCommand == CommandEventId::Wheel || nCommand == CommandEventId::StartAutoScroll
+        || nCommand == CommandEventId::AutoScroll || nCommand == CommandEventId::Gesture)
+    {
+        if (pView->HandleScrollCommand(rCEvt, aHorSBar.get(), aVerSBar.get()))
+            return;
+    }
 
     if (bContextMenuHandling && nCommand == CommandEventId::ContextMenu)
     {
commit 49943f9930e1794063f1e7353d37bc98b79c39e7
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed May 29 15:29:04 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 17 15:08:25 2019 +0200

    lok: send message when in place editing
    
    Change-Id: I96d22cabeda1eb851116d556a5302394a0dd7f93
    Reviewed-on: https://gerrit.libreoffice.org/73162
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 442466d37295..efd495bb428c 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -740,7 +740,12 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
 
         if(pSdrOle2Obj && (pSdrOle2Obj->isInplaceActive() || pSdrOle2Obj->isUiActive()))
         {
-            return;
+            if(SfxViewShell* pViewShell = GetSfxViewShell())
+            {
+                pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_GRAPHIC_SELECTION, "INPLACE");
+                SfxLokHelper::notifyOtherViews(pViewShell, LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "selection", "INPLACE");
+                return;
+            }
         }
 
         if (bTiledRendering && mpMarkedObj->GetObjIdentifier() == OBJ_TABLE)
commit 4fab6dab74ded696f2f3069cb53a8066fbdf4440
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Jun 6 17:43:20 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 17 15:08:13 2019 +0200

    lok: remove ext text event re-entrancy hazard.
    
    Change-Id: I7566c158330bab77589d422c61c64210727ab835
    Reviewed-on: https://gerrit.libreoffice.org/73625
    Tested-by: Jenkins
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/73756
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index e914d4e414b6..2db746df8162 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1133,6 +1133,12 @@ static bool ImplHandleExtTextInput( vcl::Window* pWindow,
         }
         if( !pChild->ImplGetWindowImpl()->mpFrameData->mnFocusId )
             break;
+
+        if (comphelper::LibreOfficeKit::isActive())
+        {
+            SAL_WARN("vcl", "Failed to get ext text input context");
+            break;
+        }
         Application::Yield();
     }