summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorAttila Szűcs <attila.szucs@collabora.com>2023-05-03 04:24:35 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2023-05-15 09:03:04 +0200
commit4ad89dd8166fac837d7ed6887c17f9255f06285e (patch)
tree967add61eb09b4b8fcbe9cf812139bc24908f66f /sfx2
parent627a601d1fcea0b3198654756d351b0b81600b49 (diff)
LOK: Navi-1 open/close on sidebar
Enabling Navigator sidebar in case of LOKit. Change-Id: I3a656fa12822e5866c2cd4fbf82627a88f26903a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151307 Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151704 Tested-by: Jenkins
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/ResourceManager.cxx3
-rw-r--r--sfx2/source/view/viewfrm.cxx11
2 files changed, 12 insertions, 2 deletions
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index cfc5437037cc..5974e20af488 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -260,8 +260,7 @@ void ResourceManager::ReadDeckList()
if (comphelper::LibreOfficeKit::isActive())
{
// Hide these decks in LOK as they aren't fully functional.
- if (aDeckName == "GalleryDeck" || aDeckName == "NavigatorDeck"
- || aDeckName == "StyleListDeck")
+ if (aDeckName == "GalleryDeck" || aDeckName == "StyleListDeck")
continue;
}
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index d62090bad118..bf42fc5de078 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3414,6 +3414,17 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
rReq.Done();
return;
}
+ if (nSID == SID_NAVIGATOR)
+ {
+ if (comphelper::LibreOfficeKit::isActive())
+ {
+ ShowChildWindow(SID_SIDEBAR);
+ OUString panelId = "SdNavigatorPanel";
+ ::sfx2::sidebar::Sidebar::TogglePanel(panelId, GetFrame().GetFrameInterface());
+ rReq.Done();
+ return;
+ }
+ }
bool bHasChild = HasChildWindow(nSID);
bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;