include/vcl/toolkit/fixed.hxx | 1 +
vcl/source/control/fixed.cxx | 8 ++++++++
2 files changed, 9 insertions(+)
New commits:
commit d985cfc5507f7aa4401cc1acc3e92d77036788f1
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Dec 10 11:38:57 2020 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Dec 28 18:32:49 2020 +0100
jsdialog: dump separator line
Change-Id: I2c9954a7f0ec3df3652733af54ea4b0f84af25e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107520
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108407
Tested-by: Jenkins
diff --git a/include/vcl/toolkit/fixed.hxx b/include/vcl/toolkit/fixed.hxx
index f3ce68b71444..90d19afe43bc 100644
--- a/include/vcl/toolkit/fixed.hxx
+++ b/include/vcl/toolkit/fixed.hxx
@@ -62,6 +62,7 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
virtual Size GetOptimalSize() const override;
+ virtual void DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
override;
};
class VCL_DLLPUBLIC FixedBitmap final : public Control
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 9b8e6242e296..c8ac59046181 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -25,6 +25,7 @@
#include <comphelper/string.hxx>
#include <sal/log.hxx>
#include <controldata.hxx>
+#include <tools/json_writer.hxx>
#define FIXEDLINE_TEXT_BORDER 4
@@ -656,6 +657,13 @@ Size FixedLine::GetOptimalSize() const
return CalcWindowSize( FixedText::CalcMinimumTextSize ( this ) );
}
+void FixedLine::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
+{
+ Control::DumpAsPropertyTree(rJsonWriter);
+ rJsonWriter.put("type", "separator");
+ rJsonWriter.put("orientation", (GetStyle() & WB_VERT) ? "vertical" :
"horizontal");
+}
+
void FixedBitmap::ImplInit( vcl::Window* pParent, WinBits nStyle )
{
nStyle = ImplInitStyle( nStyle );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
