1 files changed, 388 insertions, 409 deletions
diff --git a/sw/uiconfig/swriter/ui/opttablepage.ui b/sw/uiconfig/swriter/ui/opttablepage.ui
index 34d16cc8e935..da40114ed4ad 100644
--- a/sw/uiconfig/swriter/ui/opttablepage.ui
+++ b/sw/uiconfig/swriter/ui/opttablepage.ui
@@ -46,102 +46,95 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <!-- n-columns=1 n-rows=1 -->
+              <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">6</property>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid" id="grid1">
+                  <object class="GtkCheckButton" id="header">
+                    <property name="label" translatable="yes" context="opttablepage|header">H_eading</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkCheckButton" id="header">
-                        <property name="label" translatable="yes" context="opttablepage|header">H_eading</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="header-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|header">Specifies that the first row of the table is formatted with the "Table heading" Paragraph Style.</property>
-                          </object>
-                        </child>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="header-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|header">Specifies that the first row of the table is formatted with the "Table heading" Paragraph Style.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="repeatheader">
-                        <property name="label" translatable="yes" context="opttablepage|repeatheader">Re_peat on each page</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="margin-start">12</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="repeatheader-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|repeatheader">Specifies whether the table heading is carried over onto the new page after a page break.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="repeatheader">
+                    <property name="label" translatable="yes" context="opttablepage|repeatheader">Re_peat on each page</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="repeatheader-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|repeatheader">Specifies whether the table heading is carried over onto the new page after a page break.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="dontsplit">
-                        <property name="label" translatable="yes" context="opttablepage|dontsplit">_Do not split</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="dontsplit-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|dontsplit">Specifies that tables are not split by any type of text flow break.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="dontsplit">
+                    <property name="label" translatable="yes" context="opttablepage|dontsplit">_Do not split</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="dontsplit-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|dontsplit">Specifies that tables are not split by any type of text flow break.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="border">
-                        <property name="label" translatable="yes" context="opttablepage|border">B_order</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="border-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|border">Specifies that table cells have a border by default.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="border">
+                    <property name="label" translatable="yes" context="opttablepage|border">B_order</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="border-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|border">Specifies that table cells have a border by default.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
                 </child>
               </object>
             </child>
@@ -170,83 +163,76 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment2">
+              <!-- n-columns=1 n-rows=1 -->
+              <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">6</property>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid" id="grid2">
+                  <object class="GtkCheckButton" id="numformatting">
+                    <property name="label" translatable="yes" context="opttablepage|numformatting">_Number recognition</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkCheckButton" id="numformatting">
-                        <property name="label" translatable="yes" context="opttablepage|numformatting">_Number recognition</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="numformatting-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numformatting">Specifies that numbers in a text table are recognized and formatted as numbers.</property>
-                          </object>
-                        </child>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="numformatting-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numformatting">Specifies that numbers in a text table are recognized and formatted as numbers.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="numfmtformatting">
-                        <property name="label" translatable="yes" context="opttablepage|numfmtformatting">N_umber format recognition</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="margin-start">12</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="numfmtformatting-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numfmtformatting">If Number format recognition is not marked, only input in the format that has been set at the cell is accepted. Any other input resets the format to Text.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="numfmtformatting">
+                    <property name="label" translatable="yes" context="opttablepage|numfmtformatting">N_umber format recognition</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="numfmtformatting-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numfmtformatting">If Number format recognition is not marked, only input in the format that has been set at the cell is accepted. Any other input resets the format to Text.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="numalignment">
-                        <property name="label" translatable="yes" context="opttablepage|numalignment">_Alignment</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="margin-start">12</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="numalignment-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numalignment">Specifies that numbers are always bottom right aligned in the cell.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="numalignment">
+                    <property name="label" translatable="yes" context="opttablepage|numalignment">_Alignment</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="numalignment-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|numalignment">Specifies that numbers are always bottom right aligned in the cell.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
                 </child>
               </object>
             </child>
@@ -283,33 +269,181 @@
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
-          <object class="GtkAlignment" id="alignment3">
+          <!-- n-columns=1 n-rows=1 -->
+          <object class="GtkGrid" id="grid3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
+            <property name="row_spacing">12</property>
+            <property name="column_spacing">12</property>
+            <property name="margin-start">12</property>
+            <property name="margin-top">6</property>
             <child>
               <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkGrid" id="grid3">
+              <object class="GtkGrid" id="grid5">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">18</property>
+                <child>
+                  <object class="GtkLabel" id="label10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="opttablepage|label10">Behavior of rows/columns</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="fix">
+                    <property name="label" translatable="yes" context="opttablepage|fix">_Fixed</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="fix-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fix">Specifies that changes to a row or column only affect the corresponding adjacent area.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="fixprop">
+                    <property name="label" translatable="yes" context="opttablepage|fixprop">Fi_xed, proportional</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">fix</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="fixprop-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fixprop">Specifies that changes to a row or column have an effect on the entire table.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkRadioButton" id="var">
+                    <property name="label" translatable="yes" context="opttablepage|var">_Variable</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin-start">12</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">fix</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="var-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|var">Specifies that changes to a row or column affect the table size.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label11">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes" context="opttablepage|label11">Changes affect the adjacent area only</property>
+                    <property name="wrap">True</property>
+                    <property name="wrap_mode">char</property>
+                    <property name="width_chars">50</property>
+                    <property name="max_width_chars">50</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label12">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes" context="opttablepage|label12">Changes affect the entire table</property>
+                    <property name="wrap">True</property>
+                    <property name="width_chars">50</property>
+                    <property name="max_width_chars">50</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label13">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes" context="opttablepage|label13">Changes affect the table size</property>
+                    <property name="wrap">True</property>
+                    <property name="width_chars">50</property>
+                    <property name="max_width_chars">50</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="spacing">12</property>
+                <property name="homogeneous">True</property>
                 <child>
                   <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid" id="grid5">
+                  <object class="GtkGrid" id="grid4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
                     <property name="row_spacing">6</property>
-                    <property name="column_spacing">18</property>
+                    <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkLabel" id="label10">
+                      <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="opttablepage|label10">Behavior of rows/columns</property>
+                        <property name="label" translatable="yes" context="opttablepage|label4">Move cells</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -319,100 +453,118 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="fix">
-                        <property name="label" translatable="yes" context="opttablepage|fix">_Fixed</property>
+                      <object class="GtkSpinButton" id="rowmove">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="margin-start">12</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="halign">start</property>
+                        <property name="adjustment">adjustment1</property>
+                        <property name="digits">2</property>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="fix-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fix">Specifies that changes to a row or column only affect the corresponding adjacent area.</property>
+                          <object class="AtkObject" id="rowmove-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowmove">Specifies the value to be used for moving a row.</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="fixprop">
-                        <property name="label" translatable="yes" context="opttablepage|fixprop">Fi_xed, proportional</property>
+                      <object class="GtkSpinButton" id="colmove">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="margin-start">12</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">fix</property>
+                        <property name="halign">start</property>
+                        <property name="adjustment">adjustment2</property>
+                        <property name="digits">2</property>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="fixprop-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|fixprop">Specifies that changes to a row or column have an effect on the entire table.</property>
+                          <object class="AtkObject" id="colmove-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|colmove">Specifies the value to be used for moving a column.</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkRadioButton" id="var">
-                        <property name="label" translatable="yes" context="opttablepage|var">_Variable</property>
+                      <object class="GtkLabel" id="label5">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
+                        <property name="can_focus">False</property>
                         <property name="margin-start">12</property>
+                        <property name="label" translatable="yes" context="opttablepage|label5">_Row:</property>
                         <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">rowmove</property>
                         <property name="xalign">0</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">fix</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="var-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|var">Specifies that changes to a row or column affect the table size.</property>
-                          </object>
-                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label11">
+                      <object class="GtkLabel" id="label6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes" context="opttablepage|label11">Changes affect the adjacent area only</property>
-                        <property name="wrap">True</property>
-                        <property name="wrap_mode">char</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
+                        <property name="margin-start">12</property>
+                        <property name="label" translatable="yes" context="opttablepage|label6">_Column:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">colmove</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <!-- n-columns=1 n-rows=1 -->
+                  <object class="GtkGrid" id="grid6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkSpinButton" id="rowinsert">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="halign">start</property>
+                        <property name="adjustment">adjustment3</property>
+                        <property name="digits">2</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="rowinsert-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowinsert">Specifies the default value for inserting rows.</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
                         <property name="left_attach">1</property>
                         <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label12">
+                      <object class="GtkSpinButton" id="colinsert">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes" context="opttablepage|label12">Changes affect the entire table</property>
-                        <property name="wrap">True</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
-                        <property name="xalign">0</property>
+                        <property name="can_focus">True</property>
+                        <property name="halign">start</property>
+                        <property name="adjustment">adjustment4</property>
+                        <property name="digits">2</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="colinsert-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|colinsert">Specifies the default value for inserting columns.</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -420,233 +572,60 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label13">
+                      <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes" context="opttablepage|label13">Changes affect the table size</property>
-                        <property name="wrap">True</property>
-                        <property name="width_chars">50</property>
-                        <property name="max_width_chars">50</property>
+                        <property name="margin-start">12</property>
+                        <property name="label" translatable="yes" context="opttablepage|label15">Ro_w:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">rowinsert</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</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">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="box1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="spacing">12</property>
-                    <property name="homogeneous">True</property>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid4">
+                      <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="hexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="opttablepage|label4">Move cells</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="rowmove">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">start</property>
-                            <property name="adjustment">adjustment1</property>
-                            <property name="digits">2</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="rowmove-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowmove">Specifies the value to be used for moving a row.</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="colmove">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">start</property>
-                            <property name="adjustment">adjustment2</property>
-                            <property name="digits">2</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="colmove-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|colmove">Specifies the value to be used for moving a column.</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin-start">12</property>
-                            <property name="label" translatable="yes" context="opttablepage|label5">_Row:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">rowmove</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin-start">12</property>
-                            <property name="label" translatable="yes" context="opttablepage|label6">_Column:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">colmove</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
+                        <property name="margin-start">12</property>
+                        <property name="label" translatable="yes" context="opttablepage|label16">Colu_mn:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">colinsert</property>
+                        <property name="xalign">0</property>
                       </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">2</property>
                       </packing>
                     </child>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid6">
+                      <object class="GtkLabel" id="label14">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="hexpand">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
-                        <child>
-                          <object class="GtkSpinButton" id="rowinsert">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">start</property>
-                            <property name="adjustment">adjustment3</property>
-                            <property name="digits">2</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="rowinsert-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|rowinsert">Specifies the default value for inserting rows.</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="colinsert">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="halign">start</property>
-                            <property name="adjustment">adjustment4</property>
-                            <property name="digits">2</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="colinsert-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|colinsert">Specifies the default value for inserting columns.</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label15">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin-start">12</property>
-                            <property name="label" translatable="yes" context="opttablepage|label15">Ro_w:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">rowinsert</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin-start">12</property>
-                            <property name="label" translatable="yes" context="opttablepage|label16">Colu_mn:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">colinsert</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="opttablepage|label14">Insert cell</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes" context="opttablepage|label14">Insert cell</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</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">0</property>
+              </packing>
             </child>
           </object>
         </child>