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

[Szymon Kłos (via logerrit)]

 include/svx/colorbox.hxx         |    2 ++
 svx/source/tbxctrls/tbcontrl.cxx |    7 +++++++
 2 files changed, 9 insertions(+)

New commits:
commit fe8dc93fa6afa3b0ac7211058ea963ab97b15615
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Nov 27 11:30:06 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Nov 27 15:00:37 2019 +0100

    jsdiloag: export SvxColorBox to JSON
    
    Change-Id: I1a1296ed2981867af6dac22ba03423a3e5f3d5b5
    Reviewed-on: https://gerrit.libreoffice.org/83898
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index 0a62fafceacc..f6990e39576e 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -78,6 +78,8 @@ public:
     bool IsValueChangedFromSaved() const { return m_aSaveColor != GetSelectEntryColor(); }
 
     DECL_LINK(WindowEventListener, VclWindowEvent&, void);
+
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 };
 
 class ListBoxColorWrapper
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 5427a40f60e3..6aa577dbf859 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3773,6 +3773,13 @@ void SvxColorListBox::SelectEntry(const Color& rColor)
     ShowPreview(m_aSelectedColor);
 }
 
+boost::property_tree::ptree SvxColorListBox::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree = MenuButton::DumpAsPropertyTree();
+    aTree.put("type", "colorlistbox");
+    return aTree;
+}
+
 ColorListBox::ColorListBox(std::unique_ptr<weld::MenuButton> pControl, weld::Window* pTopLevel)
     : m_xButton(std::move(pControl))
     , m_pTopLevel(pTopLevel)