[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Mar 16 13:40:02 UTC 2021
include/vcl/weld.hxx | 1 +
vcl/inc/salvtables.hxx | 2 ++
vcl/source/app/salvtables.cxx | 5 +++++
vcl/unx/gtk3/gtk3gtkinst.cxx | 5 +++++
4 files changed, 13 insertions(+)
New commits:
commit 90f25a4ff279aa4561861c313c7c18b9d42777a8
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 16 11:30:07 2021 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Mar 16 14:39:17 2021 +0100
add access to DumpAsPropertyTree for sidebar::Deck
Change-Id: I9df780ba3a6701275256fff585f4a969178aaff2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112574
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 0b995277cd31..1fc18c85fb65 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -317,6 +317,7 @@ public:
virtual css::uno::Reference<css::datatransfer::dnd::XDropTarget> get_drop_target() = 0;
virtual void connect_get_property_tree(const Link<tools::JsonWriter&, void>& rLink) = 0;
+ virtual void get_property_tree(tools::JsonWriter& rJsonWriter) = 0;
// render the widget to an output device
virtual void draw(OutputDevice& rOutput, const Point& rPos, const Size& rSizePixel) = 0;
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 340c546f6f40..efec58258868 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -365,6 +365,8 @@ public:
virtual void connect_get_property_tree(const Link<tools::JsonWriter&, void>& rLink) override;
+ virtual void get_property_tree(tools::JsonWriter& rJsonWriter) override;
+
virtual void set_stack_background() override;
virtual void set_title_background() override;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 083f571d858b..2a0009446132 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -539,6 +539,11 @@ void SalInstanceWidget::connect_get_property_tree(const Link<tools::JsonWriter&,
m_xWidget->SetDumpAsPropertyTreeHdl(rLink);
}
+void SalInstanceWidget::get_property_tree(tools::JsonWriter& rJsonWriter)
+{
+ m_xWidget->DumpAsPropertyTree(rJsonWriter);
+}
+
void SalInstanceWidget::set_stack_background()
{
set_background(m_xWidget->GetSettings().GetStyleSettings().GetWindowColor());
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 882a6f0210e5..d15ee5d5a7e8 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3049,6 +3049,11 @@ public:
//not implemented for the gtk variant
}
+ virtual void get_property_tree(tools::JsonWriter& /*rJsonWriter*/) override
+ {
+ //not implemented for the gtk variant
+ }
+
virtual void set_stack_background() override
{
do_set_background(Application::GetSettings().GetStyleSettings().GetWindowColor());
More information about the Libreoffice-commits
mailing list