diff options
| author | Attila Szűcs <attila.szucs@collabora.com> | 2023-05-03 04:24:35 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2023-05-15 09:03:04 +0200 |
| commit | 4ad89dd8166fac837d7ed6887c17f9255f06285e (patch) | |
| tree | 967add61eb09b4b8fcbe9cf812139bc24908f66f /vcl | |
| parent | 627a601d1fcea0b3198654756d351b0b81600b49 (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 'vcl')
| -rw-r--r-- | vcl/jsdialog/enabled.cxx | 6 | ||||
| -rw-r--r-- | vcl/jsdialog/jsdialogbuilder.cxx | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 73a4eedf96b4..36707140b927 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -299,7 +299,7 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile) { if (// scalc rUIFile == u"modules/scalc/ui/functionpanel.ui" - //|| rUIFile == u"modules/scalc/ui/navigatorpanel.ui" + || rUIFile == u"modules/scalc/ui/navigatorpanel.ui" || rUIFile == u"modules/scalc/ui/sidebaralignment.ui" || rUIFile == u"modules/scalc/ui/sidebarcellappearance.ui" || rUIFile == u"modules/scalc/ui/sidebarnumberformat.ui" @@ -316,7 +316,7 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile) || rUIFile == u"modules/simpress/ui/masterpagepanel.ui" || rUIFile == u"modules/simpress/ui/masterpagepanelall.ui" || rUIFile == u"modules/simpress/ui/masterpagepanelrecent.ui" - //|| rUIFile == u"modules/simpress/ui/navigatorpanel.ui" + || rUIFile == u"modules/simpress/ui/navigatorpanel.ui" || rUIFile == u"modules/simpress/ui/sidebarslidebackground.ui" || rUIFile == u"modules/simpress/ui/slidetransitionspanel.ui" || rUIFile == u"modules/simpress/ui/tabledesignpanel.ui" @@ -325,7 +325,7 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile) || rUIFile == u"modules/smath/ui/sidebarproperties_math.ui" // swriter || rUIFile == u"modules/swriter/ui/managechangessidebar.ui" - //|| rUIFile == u"modules/swriter/ui/navigatorpanel.ui" + || rUIFile == u"modules/swriter/ui/navigatorpanel.ui" || rUIFile == u"modules/swriter/ui/pagefooterpanel.ui" || rUIFile == u"modules/swriter/ui/pageformatpanel.ui" || rUIFile == u"modules/swriter/ui/pageheaderpanel.ui" diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index a3c55e28ddfb..b894395e4660 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -143,7 +143,8 @@ std::unique_ptr<tools::JsonWriter> JSDialogNotifyIdle::generateFullUpdate() cons return aJsonWriter; m_aContentWindow->DumpAsPropertyTree(*aJsonWriter); - aJsonWriter->put("id", m_aNotifierWindow->GetLOKWindowId()); + if (m_aNotifierWindow) + aJsonWriter->put("id", m_aNotifierWindow->GetLOKWindowId()); aJsonWriter->put("jsontype", m_sTypeOfJSON); return aJsonWriter; @@ -159,7 +160,8 @@ JSDialogNotifyIdle::generateWidgetUpdate(VclPtr<vcl::Window> pWindow) const aJsonWriter->put("jsontype", m_sTypeOfJSON); aJsonWriter->put("action", "update"); - aJsonWriter->put("id", m_aNotifierWindow->GetLOKWindowId()); + if (m_aNotifierWindow) + aJsonWriter->put("id", m_aNotifierWindow->GetLOKWindowId()); { auto aEntries = aJsonWriter->startNode("control"); pWindow->DumpAsPropertyTree(*aJsonWriter); @@ -187,7 +189,8 @@ JSDialogNotifyIdle::generateActionMessage(VclPtr<vcl::Window> pWindow, aJsonWriter->put("jsontype", m_sTypeOfJSON); aJsonWriter->put("action", "action"); - aJsonWriter->put("id", m_aNotifierWindow->GetLOKWindowId()); + if (m_aNotifierWindow) + aJsonWriter->put("id", m_aNotifierWindow->GetLOKWindowId()); { auto aDataNode = aJsonWriter->startNode("data"); |