[Libreoffice-commits] core.git: 2 commits - sfx2/inc sfx2/source

[Szymon KÅ‚os (via logerrit)]

 sfx2/inc/sidebar/PanelTitleBar.hxx |    2 ++
 sfx2/source/appl/appserv.cxx       |    3 +++
 sfx2/source/sidebar/Deck.cxx       |    3 +++
 3 files changed, 8 insertions(+)

New commits:
commit 83c4cdf4b8469dbe905349cc63b3b3512108e368
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Jul 26 11:59:39 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Aug 18 16:22:48 2021 +0200

    online: keep sidebar opened
    
    when we switch mode in online keep sidebar in opened
    state. For example when switching from notebookbar
    to classic mode - sidebar is set to "Tabs" what makes
    sidebar hidden in online. The same happened when
    crash occured.
    
    Change-Id: I5d0d1dba4c89b5e380a0bf717fabf4337016894c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119496
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120660
    Tested-by: Jenkins

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 7339f34791d8..d2db452e0815 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -889,6 +889,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
                     // Sidebar
                     pViewFrame->ShowChildWindow( SID_SIDEBAR );
 
+                    if (comphelper::LibreOfficeKit::isActive())
+                        aSidebarMode = "Opened";
+
                     sfx2::sidebar::SidebarController* pSidebar =
                             sfx2::sidebar::SidebarController::GetSidebarControllerForFrame( xFrame );
                     if ( pSidebar )
commit 358c7958b171eedac7b9b998448a27dd1b80af78
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Sat Jul 17 16:31:09 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Aug 18 16:22:34 2021 +0200

    jsdialog: dump more options command for panels
    
    Change-Id: I04d71d318d97916f040de7a617a802dd895faed5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119104
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120659
    Tested-by: Jenkins

diff --git a/sfx2/inc/sidebar/PanelTitleBar.hxx b/sfx2/inc/sidebar/PanelTitleBar.hxx
index 8a90f8a79101..8ebd1af1800c 100644
--- a/sfx2/inc/sidebar/PanelTitleBar.hxx
+++ b/sfx2/inc/sidebar/PanelTitleBar.hxx
@@ -48,6 +48,8 @@ public:
         return *mxExpander;
     }
 
+    OUString GetMoreOptionsCommand() { return msMoreOptionsCommand; }
+
 private:
     virtual void HandleToolBoxItemClick() override;
 
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 7494e99c7feb..0fec11ef4e89 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -143,6 +143,9 @@ void Deck::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
         rJsonWriter.put("hidden", it->IsLurking());
         rJsonWriter.put("expanded", it->IsExpanded());
 
+        if (it->GetTitleBar() && !it->GetTitleBar()->GetMoreOptionsCommand().isEmpty())
+            rJsonWriter.put("command", it->GetTitleBar()->GetMoreOptionsCommand());
+
         {
             auto children2Node = rJsonWriter.startArray("children");
             {