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

[Ashod Nakashian (via logerrit)]

 sc/source/ui/app/inputwin.cxx    |    7 ++++++-
 sfx2/source/control/dispatch.cxx |    4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 88565c3662c6fde240c98a9b4f2ce6dfbcf4094e
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Aug 9 23:14:34 2018 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu May 2 11:17:02 2019 +0200

    sfx2: Re-enable the sidebars for LOK
    
    This re-enables the sidebars for LOK, which were
    disabled to avoid overheads.
    
    Also, fixes a regression where editing stopped
    when loading a new view because the sidebar window
    creation killed the edit view.
    
    Revert "Avoid various desktop GUI elements when used from LibreOfficeKit"
    This reverts commit c0b70ec34d5e056bb92a66cbf83838923cb41fee.
    
    Change-Id: I06b06a990f05c06b1889fa89b698dff6f494e09c
    Reviewed-on: https://gerrit.libreoffice.org/71165
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index d8cca415d466..33379e4dd571 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -75,6 +75,7 @@
 #include <svtools/miscopt.hxx>
 #include <comphelper/string.hxx>
 #include <com/sun/star/frame/XLayoutManager.hpp>
+#include <comphelper/lok.hxx>
 
 #define THESIZE             1000000 // Should be more than enough!
 #define TBX_WINDOW_HEIGHT   22 // in pixel - TODO: The same on all systems?
@@ -252,7 +253,11 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) :
             pInputHdl->SetMode( SC_INPUT_TABLE ); // Focus ends up at the bottom anyways
     }
     else if (pViewSh)
-        pViewSh->UpdateInputHandler(true); // Absolutely necessary update
+    {
+        // Don't stop editing in LOK a remote user might be editing.
+        const bool bStopEditing = !comphelper::LibreOfficeKit::isActive();
+        pViewSh->UpdateInputHandler(true, bStopEditing); // Absolutely necessary update
+    }
 
     SetAccessibleName(ScResId(STR_ACC_TOOLBAR_FORMULA));
 }
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 5ea2ca744ea9..04a6ca8d7ea8 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1192,7 +1192,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
         return;
 
     SfxViewFrame* pTop = xImp->pFrame ? xImp->pFrame->GetTopViewFrame() : nullptr;
-    bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this && !comphelper::LibreOfficeKit::isActive();
+    bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this;
 
     if ( !bUIActive && pTop && GetBindings() == &pTop->GetBindings() )
         // keep own tools internally for collecting
@@ -1255,7 +1255,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
     }
 
     Update_Impl_( bUIActive, !bIsIPActive, bIsIPActive, pWorkWin );
-    if ( (bUIActive || bIsActive) && !comphelper::LibreOfficeKit::isActive() )
+    if (bUIActive || bIsActive)
         pWorkWin->UpdateObjectBars_Impl();
 
     if ( pBindings )