[Libreoffice-commits] core.git: include/vcl vcl/source
Szymon KÅos (via logerrit)
logerrit at kemper.freedesktop.org
Thu Nov 26 12:03:02 UTC 2020
include/vcl/layout.hxx | 1 +
vcl/source/window/layout.cxx | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 10a249a9469c27a74e9c29bb68e0bc796bc93493
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: Thu Nov 26 13:02:19 2020 +0100
jsdialog: dump VclExpander type
Change-Id: Ie40632ab8ce53e0b1f9277dce3d46032a508edce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106663
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index cea55a78755e..34d7e9a023c9 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -489,6 +489,7 @@ public:
const vcl::Window *get_label_widget() const;
virtual void StateChanged(StateChangedType nType) override;
void SetExpandedHdl( const Link<VclExpander&,void>& rLink ) { maExpandedHdl = rLink; }
+ virtual void DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) 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 9b562c340b6b..ba144b5a53b4 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -28,7 +28,6 @@
#include <svdata.hxx>
#include <window.h>
#include <boost/multi_array.hpp>
-#include <boost/property_tree/ptree.hpp>
#include <vcl/toolkit/vclmedit.hxx>
#include <sal/log.hxx>
#include <tools/json_writer.hxx>
@@ -1788,6 +1787,11 @@ vcl::Window *VclExpander::get_label_widget()
return const_cast<vcl::Window*>(const_cast<const VclExpander*>(this)->get_label_widget());
}
+void VclExpander::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
+{
+ VclContainer::DumpAsPropertyTree(rJsonWriter);
+ rJsonWriter.put("type", "expander");
+}
IMPL_LINK( VclExpander, ClickHdl, CheckBox&, rBtn, void )
{
More information about the Libreoffice-commits
mailing list