[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - include/sfx2 include/vcl sfx2/source vcl/source

[Szymon Kłos (via logerrit)]

 include/sfx2/sidebar/Panel.hxx |    1 +
 include/vcl/lstbox.hxx         |    2 ++
 sfx2/source/sidebar/Panel.cxx  |    7 +++++++
 vcl/source/control/listbox.cxx |   17 +++++++++++++++++
 4 files changed, 27 insertions(+)

New commits:
commit 7836d56a007030deb8cf1872f753a94bfeaaeb06
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Sep 25 10:19:10 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Sep 30 09:46:06 2019 +0200

    jsdialogs: send listbox entries
    
    Change-Id: I00b2260e2ceaffbfbe415633ef5a35c7d147b44a
    Reviewed-on: https://gerrit.libreoffice.org/79696
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 115645b17ab8..f16c267b3607 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -277,6 +277,8 @@ public:
     static sal_Int32 NaturalSortCompare(const OUString &rA, const OUString &rB);
 
     virtual FactoryFunction GetUITestFactory() const override;
+
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 };
 
 class VCL_DLLPUBLIC MultiListBox : public ListBox
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index f3d9526e09d6..88f0a64c44d4 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -1445,6 +1445,23 @@ FactoryFunction ListBox::GetUITestFactory() const
     return ListBoxUIObject::create;
 }
 
+boost::property_tree::ptree ListBox::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree(Control::DumpAsPropertyTree());
+    boost::property_tree::ptree aEntries;
+
+    for (int i = 0; i < GetEntryCount(); ++i)
+    {
+        boost::property_tree::ptree aEntry;
+        aEntry.put("", GetEntry(i));
+        aEntries.push_back(std::make_pair("", aEntry));
+    }
+
+    aTree.add_child("entries", aEntries);
+
+    return aTree;
+}
+
 MultiListBox::MultiListBox( vcl::Window* pParent, WinBits nStyle ) :
     ListBox( WindowType::MULTILISTBOX )
 {
commit a6cd3f07572266e7cf25e16b611afded66297ec9
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Sep 24 14:18:16 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Sep 30 09:45:58 2019 +0200

    jsdialogs: set panel as a separate type
    
    Change-Id: I715915ddcaff807ae6a6593dd776dbdb86f2bf4a
    Reviewed-on: https://gerrit.libreoffice.org/79694
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index 119843cc6c4e..2beec47dfea6 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -61,6 +61,7 @@ public:
     virtual void Resize() override;
     virtual void DataChanged (const DataChangedEvent& rEvent) override;
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 
 private:
     const OUString msPanelId;
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index f1057ad2027b..0abb5907aac5 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -77,6 +77,13 @@ void Panel::ApplySettings(vcl::RenderContext& rRenderContext)
     rRenderContext.SetBackground(Theme::GetPaint(Theme::Paint_PanelBackground).GetWallpaper());
 }
 
+boost::property_tree::ptree Panel::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree(vcl::Window::DumpAsPropertyTree());
+    aTree.put("type", "panel");
+    return aTree;
+}
+
 void Panel::dispose()
 {
     mxPanelComponent = nullptr;