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

[Ashod Nakashian (via logerrit)]

 sfx2/source/sidebar/SidebarChildWindow.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit fba6d4267b3f827269d6550dcb003cc56b31e493
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu May 2 23:16:30 2019 -0400
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri May 3 13:03:46 2019 +0200

    sfx2: Enable sidebar on calc and writer, but not in impress
    
    Change-Id: I8d846bc1f794cf16fd45486fd83ef87f43fd52c7
    Reviewed-on: https://gerrit.libreoffice.org/71715
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 431d98e396f4..6296c9fe05e0 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 == "simpress")
+    , mbSidebarVisibleInLOK(pInfo && (pInfo->aModule == "scalc" || pInfo->aModule == "swriter"))
 {
     SfxDockingWindow* pDockWin = VclPtr<SidebarDockingWindow>::Create(
         pBindings, *this, pParentWindow, WB_STDDOCKWIN | WB_OWNERDRAWDECORATION | WB_CLIPCHILDREN
@@ -53,8 +53,12 @@ SidebarChildWindow::SidebarChildWindow(vcl::Window* pParentWindow, sal_uInt16 nI
         // HACK: unfortunately I haven't found a clean solution to do
         // this, so do it this way:
         //
-        pDockWin->SetSizePixel(Size(TabBar::GetDefaultWidth() * GetWindow()->GetDPIScaleFactor(),
-                                    pDockWin->GetSizePixel().Height()));
+        if (!comphelper::LibreOfficeKit::isActive())
+        {
+            pDockWin->SetSizePixel(
+                Size(TabBar::GetDefaultWidth() * GetWindow()->GetDPIScaleFactor(),
+                     pDockWin->GetSizePixel().Height()));
+        }
     }
 
     pDockWin->Initialize(pInfo);