From 6d9cc23a057ceccae1398e0c89596c5599404666 Mon Sep 17 00:00:00 2001
From: andreas kainz <kainz.a@gmail.com>
Date: Wed, 9 Sep 2020 14:47:26 +0200
Subject: tdf#128135 update Pivot Table Layout to fit minimum height

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102319
Tested-by: Jenkins
Reviewed-by: Andreas Kainz <kainz.a@gmail.com>
(cherry picked from commit d435997f446941adaa76fe4b253946cd08861ffd)

Change-Id: I450625ccac06aec54371ede6bf9b50a221e1ba8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104936
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit bdc19e66f2bc1455b0cf3aff5f520e94365aba73)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106002
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
---
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui | 44 ++++++++++----------------
 1 file changed, 17 insertions(+), 27 deletions(-)

(limited to 'sc/uiconfig')

diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 4ecf7859557f..076564d1c014 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -49,7 +49,7 @@
     <property name="default_width">0</property>
     <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -128,7 +128,6 @@
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="border_width">6</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="grid7">
@@ -212,7 +211,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                     <child>
@@ -289,7 +288,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -364,7 +363,7 @@
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
@@ -442,12 +441,8 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
-                        <property name="width">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -533,7 +528,7 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">False</property>
                 <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
@@ -564,15 +559,15 @@
                     <property name="can_focus">False</property>
                     <property name="margin_left">12</property>
                     <property name="margin_top">6</property>
-                    <property name="row_spacing">6</property>
+                    <property name="row_spacing">3</property>
                     <property name="column_spacing">12</property>
+                    <property name="column_homogeneous">True</property>
                     <child>
                       <object class="GtkCheckButton" id="check-ignore-empty-rows">
                         <property name="label" translatable="yes" context="pivottablelayoutdialog|check-ignore-empty-rows">Ignore empty rows</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -588,7 +583,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -604,7 +598,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -620,7 +613,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -636,7 +628,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -652,7 +643,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="hexpand">True</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
@@ -693,7 +683,6 @@
                     <property name="margin_left">12</property>
                     <property name="margin_top">6</property>
                     <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <child>
@@ -701,7 +690,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
@@ -715,9 +703,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">3</property>
+                                <property name="column_spacing">6</property>
                                 <child>
                                   <object class="GtkRadioButton" id="destination-radio-new-sheet">
                                     <property name="label" translatable="yes" context="pivottablelayoutdialog|destination-radio-new-sheet">New sheet</property>
@@ -825,7 +812,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">none</property>
                         <child>
@@ -839,9 +825,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <property name="row_spacing">6</property>
-                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">3</property>
+                                <property name="column_spacing">6</property>
                                 <child>
                                   <object class="GtkRadioButton" id="source-radio-selection">
                                     <property name="label" translatable="yes" context="pivottablelayoutdialog|source-radio-selection">Selection</property>
@@ -950,7 +935,7 @@
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
@@ -962,5 +947,10 @@
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-11">help</action-widget>
     </action-widgets>
+    <child internal-child="accessible">
+      <object class="AtkObject" id="PivotTableLayout-atkobject">
+        <property name="AtkObject::accessible-description" translatable="yes" context="pivottablelayoutdialog|extended_tip|PivotTableLayout">Specify the layout of the table that is generated by the pivot table.</property>
+      </object>
+    </child>
   </object>
 </interface>
-- 
cgit v1.2.3