diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2019-05-02 23:16:30 -0400 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-30 18:52:48 +0200 |
| commit | 70d3bbe11e56f12a339a5b8759b53a96b4fe84ab (patch) | |
| tree | bdf973f3d73176d382f4e0bbcad566e359cc64dd /sfx2 | |
| parent | 6eae30f631ec9b0f2b1415c06f4c36a3d6e13055 (diff) | |
sfx2: Enable sidebar on calc and writer, but not in impress
Added by Noel to this commit:
And add a special deregister mode to doc_registerCallback
so we can unregister stack-based callback objects in the
presence of multiple views.
Reviewed-on: https://gerrit.libreoffice.org/71715
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit fba6d4267b3f827269d6550dcb003cc56b31e493)
Change-Id: I8d846bc1f794cf16fd45486fd83ef87f43fd52c7
Reviewed-on: https://gerrit.libreoffice.org/76555
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/SidebarChildWindow.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 678c5538aa0b..b958d840dd3b 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")) { auto 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); |