[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/vcl vcl/source

[Szymon Kłos (via logerrit)]

 include/vcl/layout.hxx       |    1 +
 vcl/source/window/layout.cxx |    7 +++++++
 2 files changed, 8 insertions(+)

New commits:
commit c08435cbb80b7ffa520a971b081e2062359e9366
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Sep 23 18:45:34 2019 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon Sep 30 09:47:20 2019 +0200

    jsdialogs: set frame as a separate type
    
    Change-Id: I7f56d49dbe3b403c3716798bb52691748974aaae
    Reviewed-on: https://gerrit.libreoffice.org/79693
    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 561a0e7135e3..0cc8fc1bdfda 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -410,6 +410,7 @@ public:
     virtual const vcl::Window *get_child() const override;
     vcl::Window *get_label_widget();
     const vcl::Window *get_label_widget() const;
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 protected:
     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 9b44f09857ae..ce7a69e6455d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1629,6 +1629,13 @@ OUString VclFrame::getDefaultAccessibleName() const
     return VclBin::getDefaultAccessibleName();
 }
 
+boost::property_tree::ptree VclFrame::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree(VclBin::DumpAsPropertyTree());
+    aTree.put("type", "frame");
+    return aTree;
+}
+
 Size VclAlignment::calculateRequisition() const
 {
     Size aRet(m_nLeftPadding + m_nRightPadding,