diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-10-25 01:35:37 -0400 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-26 11:45:54 +0200 |
| commit | e054cfb3538fec4992ab28627a26aa23b6c4fbb7 (patch) | |
| tree | b4764ddbe84f43dff123ecf92916034fdc71bf28 /sfx2 | |
| parent | 82518f1235aea055a6283bb6ce6a8a640959b564 (diff) | |
LOK: sidebar: enable only for Impress in LOK
Change-Id: Idb361164db9ea8681b45fe99608d2cb5690db161
Reviewed-on: https://gerrit.libreoffice.org/73511
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/SidebarChildWindow.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 0e5e73bbfdf5..e84d2fb4b379 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -32,7 +32,8 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR); SidebarChildWindow::SidebarChildWindow (vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) - : SfxChildWindow(pParentWindow, nId) + : SfxChildWindow(pParentWindow, nId), + mbSidebarVisibleInLOK(pInfo && pInfo->aModule == "simpress") { SetWindow(VclPtr<SidebarDockingWindow>::Create(pBindings, *this, pParentWindow, WB_STDDOCKWIN | WB_OWNERDRAWDECORATION | diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index dfc3d296068d..834bb59f26bb 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -42,6 +42,7 @@ SidebarDockingWindow::SidebarDockingWindow(SfxBindings* pSfxBindings, SidebarChi : SfxDockingWindow(pSfxBindings, &rChildWindow, pParentWindow, nBits) , mpSidebarController() , mbIsReadyToDrag(false) + , mbSidebarVisibleInLOK(rChildWindow.IsSidebarVisibleInLOK()) { // Get the XFrame from the bindings. if (pSfxBindings==nullptr || pSfxBindings->GetDispatcher()==nullptr) @@ -110,7 +111,7 @@ void SidebarDockingWindow::Resize() void SidebarDockingWindow::NotifyResize() { - if (comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current()) + if (comphelper::LibreOfficeKit::isActive() && SfxViewShell::Current() && mbSidebarVisibleInLOK) { if (!GetLOKNotifier()) SetLOKNotifier(SfxViewShell::Current()); |