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

[Jan Holesovsky (via logerrit)]

 sfx2/source/control/dispatch.cxx           |    2 +-
 sfx2/source/sidebar/SidebarChildWindow.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 29c9444b4ee2c19e707f6301aa5805e080b53d5d
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Sep 30 12:10:17 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Oct 2 22:55:20 2019 +0200

    lok: Enable sidebar also in Impress.
    
    The enabling in Impress caused a unit test
    (CppunitTest_sd_tiledrendering) breakage, so this commit also contains a
    partial revert of
    
      "sfx2: Re-enable the sidebars for LOK"
    
    It seems that all still works (the sidebar is showing), and the unit
    test passes with this.  Unfortunately I failed to find the real root
    cause, and the problem is not present in master or in cp-6.2, so let's
    live with this for the moment I think.
    
    Change-Id: I6c5c7c82a3ad81e590a891f1a8cc76a873823acf
    Reviewed-on: https://gerrit.libreoffice.org/79839
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 04a6ca8d7ea8..52481d9798d3 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1255,7 +1255,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
     }
 
     Update_Impl_( bUIActive, !bIsIPActive, bIsIPActive, pWorkWin );
-    if (bUIActive || bIsActive)
+    if ( (bUIActive || bIsActive) && !comphelper::LibreOfficeKit::isActive() )
         pWorkWin->UpdateObjectBars_Impl();
 
     if ( pBindings )
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 890b7b8cb0a9..bec06f0634d3 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -33,7 +33,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR);
 SidebarChildWindow::SidebarChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId,
                                        SfxBindings* pBindings, SfxChildWinInfo* pInfo)
     : SfxChildWindow(pParentWindow, nId)
-    , mbSidebarVisibleInLOK(pInfo && (pInfo->aModule == "scalc" || pInfo->aModule == "swriter"))
+    , mbSidebarVisibleInLOK(pInfo && (pInfo->aModule == "scalc" || pInfo->aModule == "simpress" || pInfo->aModule == "swriter"))
 {
     SfxDockingWindow* pDockWin = VclPtr<SidebarDockingWindow>::Create(
         pBindings, *this, pParentWindow, WB_STDDOCKWIN | WB_OWNERDRAWDECORATION | WB_CLIPCHILDREN