[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 Nov 30 14:04:12 UTC 2020
include/vcl/layout.hxx | 1 +
vcl/source/window/layout.cxx | 7 +++++++
2 files changed, 8 insertions(+)
New commits:
commit 6615eec8e489ae10b9df6b1f33507947ee9ce1db
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Nov 17 08:40:30 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Nov 30 15:03:38 2020 +0100
jsdialog: dump VclExpander type
Change-Id: Ie40632ab8ce53e0b1f9277dce3d46032a508edce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106569
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 d1f675a3be07..d29b631ac98c 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -493,6 +493,7 @@ public:
}
virtual void StateChanged(StateChangedType nType) override;
void SetExpandedHdl( const Link<VclExpander&,void>& rLink ) { maExpandedHdl = rLink; }
+ 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 52197b51992d..1d26ec5a8803 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1652,6 +1652,13 @@ void VclExpander::StateChanged(StateChangedType nType)
}
}
+boost::property_tree::ptree VclExpander::DumpAsPropertyTree()
+{
+ boost::property_tree::ptree aTree(VclContainer::DumpAsPropertyTree());
+ aTree.put("type", "expander");
+ return aTree;
+}
+
IMPL_LINK( VclExpander, ClickHdl, CheckBox&, rBtn, void )
{
vcl::Window *pChild = get_child();
More information about the Libreoffice-commits
mailing list