[Libreoffice-commits] core.git: include/svx svx/source
Szymon Kłos (via logerrit)
logerrit at kemper.freedesktop.org
Wed Nov 27 18:56:29 UTC 2019
include/svx/colorbox.hxx | 2 ++
svx/source/tbxctrls/tbcontrl.cxx | 7 +++++++
2 files changed, 9 insertions(+)
New commits:
commit 6975fcbafcdb19d66fc95c5746798cb5a4b31b72
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 19:54:47 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>
(cherry picked from commit fe8dc93fa6afa3b0ac7211058ea963ab97b15615)
Reviewed-on: https://gerrit.libreoffice.org/83915
Tested-by: Jenkins
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index d9bde63bdaa5..b61443ce0b61 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -70,6 +70,8 @@ public:
void EnsurePaletteManager();
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 4a14723c23e7..564f7f43b2e2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -4108,6 +4108,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)
More information about the Libreoffice-commits
mailing list