tdf#143355: fix crash with .uno:FontWork

with gen rendering part of bt:
2  0x00007fbfb39f440f in __assert_fail_base
(fmt=0x7fbfb3b5d128 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=0x7fbfac2531b0 "!w || dynamic_cast<T*>(w)", file=0x7fbfac2531ca "/home/julien/lo/libreoffice/include/vcl/builder.hxx", line=438, function=<optimized out>) at assert.c:92
3  0x00007fbfb3a03662 in __GI___assert_fail
(assertion=0x7fbfac2531b0 "!w || dynamic_cast<T*>(w)", file=0x7fbfac2531ca "/home/julien/lo/libreoffice/include/vcl/builder.hxx", line=438, function=0x7fbfac3ad73e "T *VclBuilder::get(const rtl::OString &) [T = VclBox]") at assert.c:101
4  0x00007fbfabb27ace in VclBuilder::get<VclBox>(rtl::OString const&) (this=0x6e07e70, sID="DockingFontwork") at include/vcl/builder.hxx:438
5  0x00007fbfabb065e5 in SalInstanceBuilder::weld_box(rtl::OString const&) (this=0x6ce97c0, id="DockingFontwork") at vcl/source/app/salvtables.cxx:6811
6  0x00007fbfb07d3fe9 in SfxDockingWindow::SfxDockingWindow(SfxBindings*, SfxChildWindow*, vcl::Window*, rtl::OString const&, rtl::OUString const&) (this=
0x6e37c90, vtt=0x7fbfafd55730 <VTT for SvxFontWorkDialog+8>, pBindinx=0x34f62b0, pCW=0x6e39c00, pParent=0x34f6f40, rID="DockingFontwork", rUIXMLDescription="svx/ui/dockingfontwork.ui")
at sfx2/source/dialog/dockwin.cxx:774
7  0x00007fbfaf7c3be8 in SvxFontWorkDialog::SvxFontWorkDialog(SfxBindings*, SfxChildWindow*, vcl::Window*) (this=0x6e37c90, pBindinx=0x34f62b0, pCW=0x6e39c00, _pParent=0x34f6f40)
at svx/source/dialog/fontwork.cxx:179
8  0x00007fbfaf7c728c in VclPtrInstance<SvxFontWorkDialog>::VclPtrInstance<SfxBindings*&, SvxFontWorkChildWindow*, vcl::Window*&>(SfxBindings*&, SvxFontWorkChildWindow*&&, vcl::Window*&)
(this=0x7ffc6e31bf70, arg=@0x7ffc6e31bf78: 0x34f62b0, arg=@0x7ffc6e31bf68: 0x6e39c00, arg=@0x7ffc6e31bf80: 0x34f6f40) at include/vcl/vclptr.hxx:279
9  0x00007fbfaf7c1dcc in SvxFontWorkChildWindow::SvxFontWorkChildWindow(vcl::Window*, unsigned short, SfxBindings*, SfxChildWinInfo*)
(this=0x6e39c00, _pParent=0x34f6f40, nId=10256, pBindings=0x34f62b0, pInfo=0x7ffc6e31c230) at svx/source/dialog/fontwork.cxx:169

See full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=173585

with gtk3 rendering, no crash but:
(soffice:33916): GLib-GObject-WARNING **: 20:40:33.018: invalid cast from 'GtkGrid' to 'GtkBox'

put grid into a toplevel box (git show -w to see minimal diff)

Change-Id: I05f9a295cd839f782467b85d6bafd652a405b14d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118953
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 461 insertions, 449 deletions

diff --git a/svx/uiconfig/ui/dockingfontwork.ui b/svx/uiconfig/ui/dockingfontwork.ui
index 2dac88a05e37..9c6d3de07293 100644
--- a/svx/uiconfig/ui/dockingfontwork.ui
+++ b/svx/uiconfig/ui/dockingfontwork.ui
@@ -26,557 +26,569 @@
     <property name="step_increment">0.1</property>
     <property name="page_increment">1</property>
   </object>
-  <!-- n-columns=1 n-rows=1 -->
-  <object class="GtkGrid" id="DockingFontwork">
+  <object class="GtkBox" id="DockingFontwork">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="row_spacing">12</property>
+    <property name="can-focus">False</property>
+    <property name="orientation">vertical</property>
     <child>
-      <object class="GtkToolbar" id="style">
+      <!-- n-columns=1 n-rows=1 -->
+      <object class="GtkGrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="show_arrow">False</property>
+        <property name="row_spacing">12</property>
         <child>
-          <object class="GtkRadioToolButton" id="off">
+          <object class="GtkToolbar" id="style">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|off|tooltip_text">Off</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw01.png</property>
-            <property name="active">True</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="off-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|off">Removes baseline formatting.</property>
+            <property name="show_arrow">False</property>
+            <child>
+              <object class="GtkRadioToolButton" id="off">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|off|tooltip_text">Off</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw01.png</property>
+                <property name="active">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="off-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|off">Removes baseline formatting.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparatorToolItem" id="toolbutton1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioToolButton" id="rotate">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|rotate|tooltip_text">Rotate</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw02.png</property>
-            <property name="group">off</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="rotate-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|rotate">Uses the top or the bottom edge of the selected object as the text baseline.</property>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioToolButton" id="upright">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|upright|tooltip_text">Upright</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw03.png</property>
-            <property name="group">off</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="upright-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|upright">Uses the top or the bottom edge of the selected object as the text baseline and preserves the original vertical alignment of the individual characters.</property>
+            <child>
+              <object class="GtkRadioToolButton" id="rotate">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|rotate|tooltip_text">Rotate</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw02.png</property>
+                <property name="group">off</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="rotate-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|rotate">Uses the top or the bottom edge of the selected object as the text baseline.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioToolButton" id="hori">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|hori|tooltip_text">Slant Horizontal</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw04.png</property>
-            <property name="group">off</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="hori-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|hori">Horizontally slants the characters in the text object.</property>
+            <child>
+              <object class="GtkRadioToolButton" id="upright">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|upright|tooltip_text">Upright</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw03.png</property>
+                <property name="group">off</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="upright-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|upright">Uses the top or the bottom edge of the selected object as the text baseline and preserves the original vertical alignment of the individual characters.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioToolButton" id="vert">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|vert|tooltip_text">Slant Vertical</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw05.png</property>
-            <property name="group">off</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="vert-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|vert">Vertically slants the characters in the text object.</property>
+            <child>
+              <object class="GtkRadioToolButton" id="hori">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|hori|tooltip_text">Slant Horizontal</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw04.png</property>
+                <property name="group">off</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="hori-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|hori">Horizontally slants the characters in the text object.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </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">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolbar" id="adjust">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="show_arrow">False</property>
-        <child>
-          <object class="GtkToggleToolButton" id="orientation">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|orientation|tooltip_text">Orientation</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw06.png</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="orientation-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|orientation">Reverses the text flow direction, and flips the text horizontally or vertically. To use this command, you must first apply a different baseline to the text.</property>
+            <child>
+              <object class="GtkRadioToolButton" id="vert">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|vert|tooltip_text">Slant Vertical</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw05.png</property>
+                <property name="group">off</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="vert-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|vert">Vertically slants the characters in the text object.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparatorToolItem" id="toolbutton2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkRadioToolButton" id="left">
+          <object class="GtkToolbar" id="adjust">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|left|tooltip_text">Align Left</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw07.png</property>
-            <property name="group">autosize</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="left-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|left">Aligns the text to the left end of the text baseline.</property>
+            <property name="show_arrow">False</property>
+            <child>
+              <object class="GtkToggleToolButton" id="orientation">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|orientation|tooltip_text">Orientation</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw06.png</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="orientation-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|orientation">Reverses the text flow direction, and flips the text horizontally or vertically. To use this command, you must first apply a different baseline to the text.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioToolButton" id="center">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|center|tooltip_text">Center</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw08.png</property>
-            <property name="group">autosize</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="center-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|center">Centers the text on the text baseline.</property>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioToolButton" id="right">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|right|tooltip_text">Align Right</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw09.png</property>
-            <property name="group">autosize</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="right-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|right">Aligns the text to the right end of the text baseline.</property>
+            <child>
+              <object class="GtkRadioToolButton" id="left">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|left|tooltip_text">Align Left</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw07.png</property>
+                <property name="group">autosize</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="left-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|left">Aligns the text to the left end of the text baseline.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioToolButton" id="autosize">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|autosize|tooltip_text">AutoSize Text</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw010.png</property>
-            <property name="active">True</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="autosize-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|autosize">Resizes the text to fit the length of the text baseline.</property>
+            <child>
+              <object class="GtkRadioToolButton" id="center">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|center|tooltip_text">Center</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw08.png</property>
+                <property name="group">autosize</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="center-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|center">Centers the text on the text baseline.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </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>
-      </packing>
-    </child>
-    <child>
-      <!-- n-columns=1 n-rows=1 -->
-      <object class="GtkGrid" id="grid2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">end</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkImage" id="image1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="icon_name">svx/res/fw020.png</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="distance">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|distance|tooltip_text">Distance</property>
-            <property name="adjustment">adjustment1</property>
-            <property name="digits">2</property>
-            <property name="truncate-multiline">True</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="distance-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|distance">Enter the amount of space that you want to leave between the text baseline and the base of the individual characters.</property>
+            <child>
+              <object class="GtkRadioToolButton" id="right">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|right|tooltip_text">Align Right</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw09.png</property>
+                <property name="group">autosize</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="right-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|right">Aligns the text to the right end of the text baseline.</property>
+                  </object>
+                </child>
               </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>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
-      </packing>
-    </child>
-    <child>
-      <!-- n-columns=1 n-rows=1 -->
-      <object class="GtkGrid" id="grid3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">end</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkImage" id="image2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="icon_name">svx/res/fw021.png</property>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="indent">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|indent|tooltip_text">Indent</property>
-            <property name="text">0.00</property>
-            <property name="adjustment">adjustment2</property>
-            <property name="digits">2</property>
-            <property name="truncate-multiline">True</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="indent-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|indent">Enter the amount of space to leave between the beginning of the text baseline, and the beginning of the text.</property>
+            <child>
+              <object class="GtkRadioToolButton" id="autosize">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|autosize|tooltip_text">AutoSize Text</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw010.png</property>
+                <property name="active">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="autosize-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|autosize">Resizes the text to fit the length of the text baseline.</property>
+                  </object>
+                </child>
               </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="left_attach">0</property>
+            <property name="top_attach">1</property>
           </packing>
         </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkToolbar" id="shadow">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="show_arrow">False</property>
         <child>
-          <object class="GtkToggleToolButton" id="contour">
+          <!-- n-columns=1 n-rows=1 -->
+          <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|contour|tooltip_text">Contour</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw011.png</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="contour-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|contour">Shows or hides the text baseline, or the edges of the selected object.</property>
+            <property name="halign">end</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="icon_name">svx/res/fw020.png</property>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleToolButton" id="textcontour">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|textcontour|tooltip_text">Text Contour</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw012.png</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="textcontour-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|textcontour">Shows or hides the borders of the individual characters in the text.</property>
+            <child>
+              <object class="GtkSpinButton" id="distance">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|distance|tooltip_text">Distance</property>
+                <property name="adjustment">adjustment1</property>
+                <property name="digits">2</property>
+                <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="distance-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|distance">Enter the amount of space that you want to leave between the text baseline and the base of the individual characters.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparatorToolItem" id="toolbutton3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkRadioToolButton" id="noshadow">
+          <!-- n-columns=1 n-rows=1 -->
+          <object class="GtkGrid" id="grid3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|noshadow|tooltip_text">No Shadow</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw013.png</property>
-            <property name="active">True</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="noshadow-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|noshadow">Removes the shadow effects that you applied to the text.</property>
+            <property name="halign">end</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkImage" id="image2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="icon_name">svx/res/fw021.png</property>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioToolButton" id="vertical">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|vertical|tooltip_text">Vertical</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw014.png</property>
-            <property name="group">noshadow</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="vertical-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|vertical">Adds a shadow to the text in the selected object. Click this button, and then enter the dimensions of the shadow in the Distance X and the Distance Y boxes.</property>
+            <child>
+              <object class="GtkSpinButton" id="indent">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|indent|tooltip_text">Indent</property>
+                <property name="text">0.00</property>
+                <property name="adjustment">adjustment2</property>
+                <property name="digits">2</property>
+                <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="indent-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|indent">Enter the amount of space to leave between the beginning of the text baseline, and the beginning of the text.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="homogeneous">True</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
           </packing>
         </child>
         <child>
-          <object class="GtkRadioToolButton" id="slant">
+          <object class="GtkToolbar" id="shadow">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|slant|tooltip_text">Slant</property>
-            <property name="use_underline">True</property>
-            <property name="icon_name">svx/res/fw015.png</property>
-            <property name="group">noshadow</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="slant-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|slant">Adds a slant shadow to the text in the selected object. Click this button, and then enter the dimensions of the shadow in the Distance X and the Distance Y boxes.</property>
+            <property name="show_arrow">False</property>
+            <child>
+              <object class="GtkToggleToolButton" id="contour">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|contour|tooltip_text">Contour</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw011.png</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="contour-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|contour">Shows or hides the text baseline, or the edges of the selected object.</property>
+                  </object>
+                </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToggleToolButton" id="textcontour">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|textcontour|tooltip_text">Text Contour</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw012.png</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="textcontour-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|textcontour">Shows or hides the borders of the individual characters in the text.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="toolbutton3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioToolButton" id="noshadow">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|noshadow|tooltip_text">No Shadow</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw013.png</property>
+                <property name="active">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="noshadow-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|noshadow">Removes the shadow effects that you applied to the text.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioToolButton" id="vertical">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|vertical|tooltip_text">Vertical</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw014.png</property>
+                <property name="group">noshadow</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="vertical-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|vertical">Adds a shadow to the text in the selected object. Click this button, and then enter the dimensions of the shadow in the Distance X and the Distance Y boxes.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioToolButton" id="slant">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|slant|tooltip_text">Slant</property>
+                <property name="use_underline">True</property>
+                <property name="icon_name">svx/res/fw015.png</property>
+                <property name="group">noshadow</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="slant-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|slant">Adds a slant shadow to the text in the selected object. Click this button, and then enter the dimensions of the shadow in the Distance X and the Distance Y boxes.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
             </child>
-          </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">4</property>
-      </packing>
-    </child>
-    <child>
-      <!-- n-columns=1 n-rows=1 -->
-      <object class="GtkGrid" id="grid4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">end</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkImage" id="shadowx">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="icon_name">svx/res/fw018.png</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="top_attach">4</property>
           </packing>
         </child>
         <child>
-          <object class="GtkSpinButton" id="distancex">
+          <!-- n-columns=1 n-rows=1 -->
+          <object class="GtkGrid" id="grid4">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|distancex|tooltip_text">Distance X</property>
-            <property name="text">0.00</property>
-            <property name="adjustment">adjustment3</property>
-            <property name="digits">2</property>
-            <property name="truncate-multiline">True</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="distancex-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|distancex">Enter the horizontal distance between the text characters and the edge of the shadow.</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkImage" id="shadowx">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="icon_name">svx/res/fw018.png</property>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="distancex">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|distancex|tooltip_text">Distance X</property>
+                <property name="text">0.00</property>
+                <property name="adjustment">adjustment3</property>
+                <property name="digits">2</property>
+                <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="distancex-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|distancex">Enter the horizontal distance between the text characters and the edge of the shadow.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">5</property>
           </packing>
         </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">5</property>
-      </packing>
-    </child>
-    <child>
-      <!-- n-columns=1 n-rows=1 -->
-      <object class="GtkGrid" id="grid5">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">end</property>
-        <property name="column_spacing">12</property>
         <child>
-          <object class="GtkImage" id="shadowy">
+          <!-- n-columns=1 n-rows=1 -->
+          <object class="GtkGrid" id="grid5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="icon_name">svx/res/fw019.png</property>
+            <property name="halign">end</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkImage" id="shadowy">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">center</property>
+                <property name="icon_name">svx/res/fw019.png</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="distancey">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes" context="dockingfontwork|distancey|tooltip_text">Distance Y</property>
+                <property name="text">0.00</property>
+                <property name="adjustment">adjustment4</property>
+                <property name="digits">2</property>
+                <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="distancey-atkobject">
+                    <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|distancey">Enter the vertical distance between the text characters and the edge of the shadow.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="top_attach">6</property>
           </packing>
         </child>
         <child>
-          <object class="GtkSpinButton" id="distancey">
+          <object class="GtkMenuButton" id="color">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes" context="dockingfontwork|distancey|tooltip_text">Distance Y</property>
-            <property name="text">0.00</property>
-            <property name="adjustment">adjustment4</property>
-            <property name="digits">2</property>
-            <property name="truncate-multiline">True</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes" context="dockingfontwork|color|tooltip_text">Shadow Color</property>
+            <property name="hexpand">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+            <property name="label" translatable="no"></property>
+            <child>
+              <placeholder/>
+            </child>
             <child internal-child="accessible">
-              <object class="AtkObject" id="distancey-atkobject">
-                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|distancey">Enter the vertical distance between the text characters and the edge of the shadow.</property>
+              <object class="AtkObject" id="color-atkobject">
+                <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|color">Select a color for the text shadow.</property>
               </object>
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">7</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">6</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkMenuButton" id="color">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="tooltip_text" translatable="yes" context="dockingfontwork|color|tooltip_text">Shadow Color</property>
-        <property name="hexpand">True</property>
-        <property name="xalign">0</property>
-        <property name="draw_indicator">True</property>
-        <property name="label" translatable="no"></property>
-        <child>
-          <placeholder/>
-        </child>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="color-atkobject">
-            <property name="AtkObject::accessible-description" translatable="yes" context="dockingfontwork|extended_tip|color">Select a color for the text shadow.</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">7</property>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <child internal-child="accessible">