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

[Szymon KÅ‚os (via logerrit)]

 include/vcl/fixed.hxx                          |    2 +
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |   28 ++++++++++++++++++++++++-
 vcl/source/control/fixed.cxx                   |    9 ++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit a862c49ad5944972f336231b31fe4ad5114672fc
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Dec 10 10:47:35 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Dec 10 14:06:29 2020 +0100

    pivot table: add separator between list views
    
    Change-Id: If4cb3735014bfde6124fb1173fb03aa950c3b77a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107519
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index b4d106fb1c53..5e391b733d03 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -450,6 +450,32 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkBox" id="boxline">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="vexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkSeparator" id="separator1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
@@ -523,7 +549,7 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
commit 1a6ff3ac3aaab0e929fc5fa6791cadd4c1afb82b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Dec 10 11:38:57 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Dec 10 14:06:18 2020 +0100

    jsdialog: dump separator line
    
    Change-Id: I2c9954a7f0ec3df3652733af54ea4b0f84af25e7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107520
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index fc1563962df5..00ae91c7624a 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -113,6 +113,8 @@ public:
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
 
     virtual Size    GetOptimalSize() const override;
+
+    virtual boost::property_tree::ptree DumpAsPropertyTree() override;
 };
 
 class VCL_DLLPUBLIC FixedBitmap final : public Control
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 237f2f30e304..c5eb075a8e0d 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 <boost/property_tree/ptree.hpp>
 
 #define FIXEDLINE_TEXT_BORDER    4
 
@@ -656,6 +657,14 @@ Size FixedLine::GetOptimalSize() const
     return CalcWindowSize( FixedText::CalcMinimumTextSize ( this ) );
 }
 
+boost::property_tree::ptree FixedLine::DumpAsPropertyTree()
+{
+    boost::property_tree::ptree aTree(Control::DumpAsPropertyTree());
+    aTree.put("type", "separator");
+    aTree.put("orientation", (GetStyle() & WB_VERT) ? "vertical" : "horizontal");
+    return aTree;
+}
+
 void FixedBitmap::ImplInit( vcl::Window* pParent, WinBits nStyle )
 {
     nStyle = ImplInitStyle( nStyle );