Improve alignment and use of space in Document Properties dialog

Change-Id: Id4da1138931ef1601541b7108a4e90b3656a5ccb

3 files changed, 70 insertions, 189 deletions

diff --git a/sc/uiconfig/scalc/ui/statisticsinfopage.ui b/sc/uiconfig/scalc/ui/statisticsinfopage.ui
index f3f648db7158..a94e5dff1511 100644
--- a/sc/uiconfig/scalc/ui/statisticsinfopage.ui
+++ b/sc/uiconfig/scalc/ui/statisticsinfopage.ui
@@ -17,132 +17,112 @@
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_spacing">12</property>
-            <property name="column_spacing">18</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Number of Pages:</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Pages:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">nopages</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="nopages">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="width_chars">10</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Number of Cells:</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Cells:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">nocells</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="nocells">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="width_chars">10</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Number of Sheets:</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Sheets:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">nosheets</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="nosheets">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="use_underline">True</property>
-                <property name="width_chars">10</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Number of Formula Groups:</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Formula groups:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">noformula</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="noformula">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">start</property>
                 <property name="hexpand">True</property>
-                <property name="xalign">0</property>
                 <property name="use_underline">True</property>
-                <property name="width_chars">10</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">3</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
           </object>
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui
index b4d95576bf43..34073c12e9e2 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -14,96 +14,84 @@
       <object class="GtkLabel" id="label13">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">_Created:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showcreate</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">5</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">4</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label14">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">_Modified:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showmodify</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">6</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">5</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label15">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">_Digitally signed:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showsigned</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">8</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">7</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label16">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Last pri_nted:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showprint</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">9</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">8</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label17">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Total _editing time:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showedittime</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">10</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">9</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label18">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Re_vision number:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showrevision</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">11</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">10</property>
       </packing>
     </child>
     <child>
@@ -116,9 +104,8 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">5</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">4</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -131,9 +118,8 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">6</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">5</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -147,9 +133,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">8</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">7</property>
       </packing>
     </child>
     <child>
@@ -162,9 +146,8 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">9</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">8</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -177,9 +160,8 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">10</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">9</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -192,9 +174,8 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">11</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">10</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -209,10 +190,8 @@
         <property name="draw_indicator">True</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">12</property>
-        <property name="width">2</property>
-        <property name="height">1</property>
+        <property name="left_attach">1</property>
+        <property name="top_attach">11</property>
       </packing>
     </child>
     <child>
@@ -228,10 +207,9 @@
         <property name="draw_indicator">True</property>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">13</property>
+        <property name="left_attach">1</property>
+        <property name="top_attach">12</property>
         <property name="width">2</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -245,9 +223,7 @@
       </object>
       <packing>
         <property name="left_attach">2</property>
-        <property name="top_attach">12</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">11</property>
       </packing>
     </child>
     <child>
@@ -263,25 +239,21 @@
       </object>
       <packing>
         <property name="left_attach">2</property>
-        <property name="top_attach">8</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">7</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label11">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">_Size:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showsize</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">4</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">3</property>
       </packing>
     </child>
     <child>
@@ -294,25 +266,22 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">4</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">3</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label8">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">_Location:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showlocation</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">2</property>
       </packing>
     </child>
     <child>
@@ -326,16 +295,15 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">2</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="label7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="xpad">1</property>
         <property name="label" translatable="yes">_Type:</property>
         <property name="use_underline">True</property>
@@ -343,9 +311,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">1</property>
       </packing>
     </child>
     <child>
@@ -357,9 +323,8 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">2</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">1</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -375,24 +340,20 @@
       <packing>
         <property name="left_attach">2</property>
         <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkLabel" id="templateft">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Template:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">showtemplate</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">7</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">6</property>
       </packing>
     </child>
     <child>
@@ -405,9 +366,8 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">7</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">6</property>
+        <property name="width">2</property>
       </packing>
     </child>
     <child>
@@ -427,16 +387,13 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="nameed">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="xalign">0</property>
+            <property name="halign">start</property>
             <property name="selectable">True</property>
             <property name="single_line_mode">True</property>
             <property name="max_width_chars">56</property>
@@ -444,8 +401,6 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
@@ -453,19 +408,6 @@
         <property name="left_attach">0</property>
         <property name="top_attach">0</property>
         <property name="width">2</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkSeparator" id="separator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-        <property name="width">3</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -474,26 +416,5 @@
     <child>
       <placeholder/>
     </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <placeholder/>
-    </child>
   </object>
 </interface>
diff --git a/sw/uiconfig/swriter/ui/statisticsinfopage.ui b/sw/uiconfig/swriter/ui/statisticsinfopage.ui
index 60404dbd87b4..b6a042b1d7d4 100644
--- a/sw/uiconfig/swriter/ui/statisticsinfopage.ui
+++ b/sw/uiconfig/swriter/ui/statisticsinfopage.ui
@@ -7,12 +7,12 @@
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">18</property>
+    <property name="column_spacing">12</property>
     <child>
       <object class="GtkLabel" id="label4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Pages:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nopages</property>
@@ -26,7 +26,7 @@
       <object class="GtkLabel" id="label5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Tables:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">notables</property>
@@ -40,7 +40,7 @@
       <object class="GtkLabel" id="label6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Images:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nogrfs</property>
@@ -54,7 +54,7 @@
       <object class="GtkLabel" id="label31">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">OLE objects:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nooles</property>
@@ -68,7 +68,7 @@
       <object class="GtkLabel" id="label32">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Paragraphs:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">noparas</property>
@@ -82,7 +82,7 @@
       <object class="GtkLabel" id="label33">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Words:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nowords</property>
@@ -96,7 +96,7 @@
       <object class="GtkLabel" id="label34">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Characters:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nochars</property>
@@ -110,9 +110,7 @@
       <object class="GtkLabel" id="label35">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="valign">center</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Characters excluding spaces:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nocharsexspaces</property>
@@ -126,7 +124,7 @@
       <object class="GtkLabel" id="lineft">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">end</property>
         <property name="label" translatable="yes">Lines:</property>
         <property name="use_underline">True</property>
         <property name="mnemonic_widget">nolines</property>
@@ -142,8 +140,6 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -156,8 +152,6 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -170,8 +164,6 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -184,8 +176,6 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -198,8 +188,6 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -212,8 +200,6 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -226,8 +212,6 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -240,8 +224,6 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>
@@ -254,9 +236,7 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="hexpand">True</property>
-        <property name="xalign">1</property>
         <property name="label">...</property>
-        <property name="width_chars">10</property>
       </object>
       <packing>
         <property name="left_attach">1</property>