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

[Szymon KÅ‚os (via logerrit)]

 include/vcl/layout.hxx       |    1 +
 vcl/source/window/layout.cxx |   35 +++++++++++++++++++++++++++++++++++
 vcl/source/window/window.cxx |    3 +++
 3 files changed, 39 insertions(+)

New commits:
commit 88fd2e8c19ddf053a2406ce3567dbcebcefcef03
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Dec 9 06:51:51 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Dec 9 08:18:18 2020 +0100

    jsdialog: export column merging property in grid
    
    Change-Id: I660e7ae6b2cce41212aee37d23b37a0cb167a14c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107447
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1c8fb778c2f1..012c4389e2ce 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3379,6 +3379,9 @@ boost::property_tree::ptree Window::DumpAsPropertyTree()
                     aSubTree.put("left", sLeft);
                     aSubTree.put("top", sTop);
                 }
+                int nWidth = pChild->get_grid_width();
+                if (nWidth > 1)
+                    aSubTree.put("width", nWidth);
                 aChildren.push_back(std::make_pair("", aSubTree));
             }
             pChild = pChild->mpWindowImpl->mpNext;
commit be64f5520347919c92ba19b2be2e2b0d81677b1e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Dec 9 07:58:53 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed Dec 9 08:18:03 2020 +0100

    jsdialog: dump buttonbox properties
    
    Change-Id: I638169db902961cff58a415b009f7412cd8b274a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107449
    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 d29b631ac98c..b89cf0449ffb 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -212,6 +212,7 @@ public:
     }
     virtual bool set_property(const OString &rKey, const OUString &rValue) override;
     void sort_native_button_order();
+    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 1d26ec5a8803..d3f57be71fef 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -684,6 +684,41 @@ void VclButtonBox::setAllocation(const Size &rAllocation)
     }
 }
 
+boost::property_tree::ptree VclButtonBox::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree = VclBox::DumpAsPropertyTree();
+    aTree.put("type", "buttonbox");
+
+    switch(m_eLayoutStyle)
+    {
+        case VclButtonBoxStyle::Default:
+            aTree.put("layoutstyle", "default");
+            break;
+
+        case VclButtonBoxStyle::Spread:
+            aTree.put("layoutstyle", "spread");
+            break;
+
+        case VclButtonBoxStyle::Edge:
+            aTree.put("layoutstyle", "edge");
+            break;
+
+        case VclButtonBoxStyle::Center:
+            aTree.put("layoutstyle", "center");
+            break;
+
+        case VclButtonBoxStyle::Start:
+            aTree.put("layoutstyle", "start");
+            break;
+
+        case VclButtonBoxStyle::End:
+            aTree.put("layoutstyle", "end");
+            break;
+    }
+
+    return aTree;
+}
+
 struct ButtonOrder
 {
     const char* m_aType;