sidebar: Cleanup the .ui for ParaPropertyPanel.

Change-Id: I1670ab45de7da6097e92ebdac6bc9928bacc72ba

1 files changed, 451 insertions, 388 deletions

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index 3193f5b200d7..05fd23ce19a8 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -1,577 +1,640 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkGrid" id="ParaPropertyPanel">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="row_homogeneous">True</property>
     <property name="column_homogeneous">True</property>
     <child>
-      <object class="GtkBox" id="box1">
+      <object class="GtkGrid" id="grid4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">6</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">6</property>
+        <property name="column_homogeneous">True</property>
         <child>
-          <object class="GtkBox" id="box3">
+          <object class="GtkToolbar" id="horizontalalignment">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes">Paragraph</property>
-            <property name="spacing">12</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">Horizontal Alignment</property>
+            <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
+            <property name="halign">start</property>
+            <property name="show_arrow">False</property>
             <child>
-              <object class="GtkToolbar" id="horizontalalignment">
+              <object class="GtkToolButton" id="leftpara">
+                <property name="width_request">25</property>
+                <property name="height_request">25</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Horizontal Alignment</property>
-                <property name="margin_right">31</property>
-                <property name="show_arrow">False</property>
-                <child>
-                  <object class="GtkToolButton" id="leftpara">
-                    <property name="width_request">25</property>
-                    <property name="height_request">25</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Align Left</property>
-                    <property name="valign">start</property>
-                    <property name="action_name">.uno:LeftPara</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="centerpara">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Align Center</property>
-                    <property name="action_name">.uno:CenterPara</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="rightpara">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Align Right</property>
-                    <property name="action_name">.uno:RightPara</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="substjustify">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Align Justified</property>
-                    <property name="action_name">.uno:JustifyPara</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Align Left</property>
+                <property name="tooltip_text" translatable="yes">Align Left</property>
+                <property name="valign">start</property>
+                <property name="action_name">.uno:LeftPara</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolbar" id="verticalalignment">
+              <object class="GtkToolButton" id="centerpara">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
-                <property name="margin_left">50</property>
-                <property name="hexpand">True</property>
-                <child>
-                  <object class="GtkToolButton" id="cellverttop">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Align Top</property>
-                    <property name="action_name">.uno:CellVertTop</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="cellvertcenter">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Align Center Vertically</property>
-                    <property name="action_name">.uno:CellVertCenter</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkToolButton" id="cellvertbottom">
-                    <property name="width_request">25</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Align Bottom</property>
-                    <property name="action_name">.uno:CellVertBottom</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Align Center</property>
+                <property name="tooltip_text" translatable="yes">Align Center</property>
+                <property name="action_name">.uno:CenterPara</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="rightpara">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Align Right</property>
+                <property name="tooltip_text" translatable="yes">Align Right</property>
+                <property name="action_name">.uno:RightPara</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="substjustify">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Align Justified</property>
+                <property name="tooltip_text" translatable="yes">Align Justified</property>
+                <property name="action_name">.uno:JustifyPara</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <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="GtkBox" id="box4">
+          <object class="GtkToolbar" id="verticalalignment">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_top">4</property>
-            <property name="spacing">9</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">Vertical Alignment</property>
+            <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
+            <property name="halign">end</property>
+            <property name="hexpand">True</property>
+            <property name="show_arrow">False</property>
             <child>
-              <object class="GtkToolbar" id="numberbullet">
+              <object class="GtkToolButton" id="cellverttop">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes">Bullets and Numbering</property>
-                <property name="show_arrow">False</property>
-                <child>
-                  <object class="GtkMenuToolButton" id="bullet">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Bullets</property>
-                    <property name="is_important">True</property>
-                    <property name="action_name">.uno:DefaultBullet</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkMenuToolButton" id="number">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Numbering</property>
-                    <property name="halign">start</property>
-                    <property name="margin_right">107</property>
-                    <property name="is_important">True</property>
-                    <property name="action_name">.uno:DefaultNumbering</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Align Top</property>
+                <property name="tooltip_text" translatable="yes">Align Top</property>
+                <property name="action_name">.uno:CellVertTop</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkToolbar" id="backgroundcolor">
+              <object class="GtkToolButton" id="cellvertcenter">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Align Center Vertically</property>
+                <property name="tooltip_text" translatable="yes">Align Center Vertically</property>
+                <property name="action_name">.uno:CellVertCenter</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="cellvertbottom">
+                <property name="width_request">25</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Align Bottom</property>
+                <property name="tooltip_text" translatable="yes">Align Bottom</property>
+                <property name="action_name">.uno:CellVertBottom</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </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="GtkToolbar" id="numberbullet">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">Bullets and Numbering</property>
+            <property name="tooltip_text" translatable="yes">Bullets and Numbering</property>
+            <property name="show_arrow">False</property>
+            <child>
+              <object class="GtkMenuToolButton" id="bullet">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Bullets</property>
+                <property name="tooltip_text" translatable="yes">Bullets</property>
+                <property name="is_important">True</property>
+                <property name="action_name">.uno:DefaultBullet</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkMenuToolButton" id="number">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Numbering</property>
+                <property name="tooltip_text" translatable="yes">Numbering</property>
+                <property name="is_important">True</property>
+                <property name="action_name">.uno:DefaultNumbering</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </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="GtkToolbar" id="backgroundcolor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">Paragraph Background Color</property>
+            <property name="tooltip_text" translatable="yes">Paragraph Background Color</property>
+            <property name="halign">end</property>
+            <child>
+              <object class="GtkMenuToolButton" id="parabkcolor">
+                <property name="width_request">105</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Paragraph Background Color</property>
                 <property name="tooltip_text" translatable="yes">Paragraph Background Color</property>
-                <property name="margin_left">2</property>
-                <child>
-                  <object class="GtkMenuToolButton" id="parabkcolor">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Paragraph Background Color</property>
-                    <property name="halign">start</property>
-                    <property name="valign">start</property>
-                    <property name="margin_left">35</property>
-                    <property name="action_name">.uno:ParaBackColor</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
+                <property name="action_name">.uno:ParaBackColor</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+          </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="spacinglabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">_Spacing:</property>
+            <property name="use_underline">True</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="indentlabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">_Indent:</property>
+            <property name="use_underline">True</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="GtkToolbar" id="paraspacing">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">Spacing</property>
+            <property name="tooltip_text" translatable="yes">Spacing</property>
+            <property name="show_arrow">False</property>
+            <child>
+              <object class="GtkToolButton" id="paraspaceinc">
+                <property name="width_request">25</property>
+                <property name="height_request">25</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Increase Spacing</property>
+                <property name="tooltip_text" translatable="yes">Increase Spacing</property>
+                <property name="action_name">.uno:ParaspaceIncrease</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="paraspacedec">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Decrease Spacing</property>
+                <property name="tooltip_text" translatable="yes">Decrease Spacing</property>
+                <property name="action_name">.uno:ParaspaceDecrease</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
+            <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="GtkGrid" id="grid2">
+          <object class="GtkBox" id="box2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="GtkBox" id="labels">
+              <object class="GtkToolbar" id="indent">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Indent</property>
+                <property name="tooltip_text" translatable="yes">Indent</property>
+                <property name="show_arrow">False</property>
+                <child>
+                  <object class="GtkToolButton" id="increaseindent">
+                    <property name="width_request">15</property>
+                    <property name="height_request">25</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Increase Indent</property>
+                    <property name="tooltip_text" translatable="yes">Increase Indent</property>
+                    <property name="action_name">.uno:IncrementIndent</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
                 <child>
-                  <object class="GtkLabel" id="spacinglabel">
+                  <object class="GtkToolButton" id="decreaseindent">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Spacing:</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Decrease Indent</property>
+                    <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+                    <property name="action_name">.uno:DecrementIndent</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="indentlabel">
+                  <object class="GtkToolButton" id="hangingindent">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="xalign">0.50999999046325684</property>
-                    <property name="label" translatable="yes">_Indent:</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Switch to Hanging Indent</property>
+                    <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
+                    <property name="action_name">.uno:HangingIndent</property>
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="homogeneous">True</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="box5">
+              <object class="GtkToolbar" id="promotedemote">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Indent</property>
+                <property name="tooltip_text" translatable="yes">Indent</property>
+                <property name="show_arrow">False</property>
                 <child>
-                  <object class="GtkToolbar" id="paraspacing">
+                  <object class="GtkToolButton" id="promote">
+                    <property name="width_request">15</property>
+                    <property name="height_request">25</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_text" translatable="yes">Spacing</property>
-                    <property name="margin_right">74</property>
-                    <property name="show_arrow">False</property>
-                    <child>
-                      <object class="GtkToolButton" id="paraspaceinc">
-                        <property name="width_request">25</property>
-                        <property name="height_request">25</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Increase Spacing</property>
-                        <property name="action_name">.uno:ParaspaceIncrease</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolButton" id="paraspacedec">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Decrease Spacing</property>
-                        <property name="action_name">.uno:ParaspaceDecrease</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
+                    <property name="tooltip_markup" translatable="yes">Increase Indent</property>
+                    <property name="tooltip_text" translatable="yes">Increase Indent</property>
+                    <property name="action_name">.uno:Promote</property>
+                    <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolbar" id="indent">
+                  <object class="GtkToolButton" id="demote">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Indent</property>
-                    <property name="margin_left">63</property>
-                    <property name="show_arrow">False</property>
-                    <child>
-                      <object class="GtkToolButton" id="increaseindent">
-                        <property name="width_request">15</property>
-                        <property name="height_request">25</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Increase Indent</property>
-                        <property name="action_name">.uno:IncrementIndent</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolButton" id="decreaseindent">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Decrease Indent</property>
-                        <property name="action_name">.uno:DecrementIndent</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolButton" id="hangingindent">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
-                        <property name="action_name">.uno:HangingIndent</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Decrease Indent</property>
+                    <property name="tooltip_text" translatable="yes">Decrease Indent</property>
+                    <property name="action_name">.uno:Demote</property>
+                    <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkToolbar" id="promotedemote">
+                  <object class="GtkToolButton" id="hangingindent2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Indent</property>
-                    <property name="margin_left">63</property>
-                    <property name="show_arrow">False</property>
-                    <child>
-                      <object class="GtkToolButton" id="promote">
-                        <property name="width_request">15</property>
-                        <property name="height_request">25</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Increase Indent</property>
-                        <property name="action_name">.uno:Promote</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolButton" id="demote">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Decrease Indent</property>
-                        <property name="action_name">.uno:Demote</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolButton" id="hangingindent2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="has_tooltip">True</property>
-                        <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
-                        <property name="action_name">.uno:HangingIndent2</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="homogeneous">True</property>
-                      </packing>
-                    </child>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Switch to Hanging Indent</property>
+                    <property name="tooltip_text" translatable="yes">Switch to Hanging Indent</property>
+                    <property name="action_name">.uno:HangingIndent2</property>
+                    <property name="use_underline">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="homogeneous">True</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkGrid" id="grid1">
+          <object class="GtkBox" id="box6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_bottom">5</property>
+            <child>
+              <placeholder/>
+            </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="aboveparaspacing">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Above Paragraph Spacing</property>
                 <property name="tooltip_text" translatable="yes">Above Paragraph Spacing</property>
                 <property name="hexpand">True</property>
                 <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</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>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">4</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box7">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="belowparaspacing">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Below Paragraph Spacing</property>
                 <property name="tooltip_text" translatable="yes">Below Paragraph Spacing</property>
                 <property name="hexpand">True</property>
                 <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</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>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">5</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box8">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="beforetextindent">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_left">75</property>
                 <property name="hexpand">True</property>
                 <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</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>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box9">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="aftertextindent">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_left">75</property>
                 <property name="hexpand">True</property>
                 <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</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>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">5</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="firstlineindent">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="margin_left">75</property>
                 <property name="hexpand">True</property>
                 <property name="invisible_char">•</property>
+                <property name="invisible_char_set">True</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>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">6</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="linespacing">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_tooltip">True</property>
+            <property name="tooltip_markup" translatable="yes">Line Spacing</property>
+            <property name="tooltip_text" translatable="yes">Line Spacing</property>
+            <property name="hexpand">True</property>
             <child>
-              <object class="GtkToolbar" id="linespacing">
+              <object class="GtkMenuToolButton" id="setlinespacing">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Line Spacing</property>
                 <property name="tooltip_text" translatable="yes">Line Spacing</property>
-                <property name="hexpand">True</property>
-                <child>
-                  <object class="GtkMenuToolButton" id="setlinespacing">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">Line Spacing</property>
-                    <property name="action_name">.uno:LineSpacing</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">True</property>
-                  </packing>
-                </child>
+                <property name="action_name">.uno:LineSpacing</property>
+                <property name="use_underline">True</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>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">6</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
           </packing>
         </child>
       </object>