[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/vcl vcl/source
Szymon KÅos (via logerrit)
logerrit at kemper.freedesktop.org
Mon Dec 14 09:08:02 UTC 2020
include/vcl/layout.hxx | 1 +
vcl/source/window/layout.cxx | 7 +++++++
2 files changed, 8 insertions(+)
New commits:
commit bc58b5bfec573c0a0696415394b35a31df170bd3
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Dec 11 11:37:49 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Dec 14 10:07:25 2020 +0100
jsdialog: export alignment type
Change-Id: I846f51d522fb0639b22148c73563b177d091178c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107589
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 89a4ad72d447..63d789d28a7e 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -458,6 +458,7 @@ public:
{
}
virtual bool set_property(const OString &rKey, const OUString &rValue) override;
+ virtual boost::property_tree::ptree DumpAsPropertyTree() override;
private:
virtual Size calculateRequisition() const override;
virtual void setAllocation(const Size &rAllocation) override;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 68a87ad67245..4e2efa065439 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1564,6 +1564,13 @@ bool VclAlignment::set_property(const OString &rKey, const OUString &rValue)
return true;
}
+boost::property_tree::ptree VclAlignment::DumpAsPropertyTree()
+{
+ boost::property_tree::ptree aTree(VclContainer::DumpAsPropertyTree());
+ aTree.put("type", "alignment");
+ return aTree;
+}
+
void VclExpander::dispose()
{
m_pDisclosureButton.disposeAndClear();
More information about the Libreoffice-commits
mailing list