[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sfx2/inc sfx2/source

[Szymon KÅ‚os (via logerrit)]

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

New commits:
commit 9b09b53f35a958b4115d126d12f37e9c24a03f15
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: Mon Jul 19 09:00:01 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>

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 ebe147fcc2d2..7a64767239fb 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -145,6 +145,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");
             {