drop deprecated GtkAlignment, move left/top-padding into child margin-start/top

for chart2

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

22 files changed, 4705 insertions, 5006 deletions

diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 7eca7ab7a067..1e28b419f3e6 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -88,290 +88,284 @@
                 <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="top_padding">6</property>
-                    <property name="left_padding">12</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <property name="row_homogeneous">True</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="CB_VALUE_AS_NUMBER">
+                        <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
-                        <property name="row_homogeneous">True</property>
-                        <child>
-                          <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
-                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</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="CB_VALUE_AS_NUMBER-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_NUMBER">Displays the absolute values of the data points.</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="CB_VALUE_AS_NUMBER-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_NUMBER">Displays the absolute values of the data points.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
-                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</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="CB_VALUE_AS_PERCENTAGE-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_PERCENTAGE">Displays the percentage of the data points in each column.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
+                        <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</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="CB_VALUE_AS_PERCENTAGE-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_PERCENTAGE">Displays the percentage of the data points in each column.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="CB_CATEGORY">
-                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_CATEGORY">Show _category</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="CB_CATEGORY-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CATEGORY">Shows the data point text labels.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="CB_CATEGORY">
+                        <property name="label" translatable="yes" context="dlg_DataLabel|CB_CATEGORY">Show _category</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="CB_CATEGORY-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CATEGORY">Shows the data point text labels.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="CB_SYMBOL">
-                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_SYMBOL">Show _legend key</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="CB_SYMBOL-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_SYMBOL">Displays the legend icons next to each data point label.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="CB_SYMBOL">
+                        <property name="label" translatable="yes" context="dlg_DataLabel|CB_SYMBOL">Show _legend key</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="CB_SYMBOL-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_SYMBOL">Displays the legend icons next to each data point label.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="CB_WRAP_TEXT">
-                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_WRAP_TEXT">Auto text _wrap</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>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="CB_WRAP_TEXT">
+                        <property name="label" translatable="yes" context="dlg_DataLabel|CB_WRAP_TEXT">Auto text _wrap</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>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="PB_NUMBERFORMAT">
+                        <property name="label" translatable="yes" context="dlg_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="valign">center</property>
+                        <property name="use_underline">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="PB_NUMBERFORMAT-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_NUMBERFORMAT">Opens a dialog to select the number format.</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
+                        <property name="label" translatable="yes" context="dlg_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="valign">center</property>
+                        <property name="use_underline">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="PB_PERCENT_NUMBERFORMAT-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_PERCENT_NUMBERFORMAT">Opens a dialog to select the percentage format.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
-                          </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="CT_LABEL_DIAL">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="label" translatable="yes" context="dlg_DataLabel|CT_LABEL_DIAL">ABCD</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="boxSEPARATOR">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
                         <child>
-                          <object class="GtkButton" id="PB_NUMBERFORMAT">
-                            <property name="label" translatable="yes" context="dlg_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
+                          <object class="GtkLabel" id="FT_TEXT_SEPARATOR">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="valign">center</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
                             <property name="use_underline">True</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="PB_NUMBERFORMAT-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_NUMBERFORMAT">Opens a dialog to select the number format.</property>
-                              </object>
-                            </child>
+                            <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
-                            <property name="label" translatable="yes" context="dlg_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
+                          <object class="GtkComboBoxText" id="LB_TEXT_SEPARATOR">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
+                            <property name="can_focus">False</property>
                             <property name="valign">center</property>
-                            <property name="use_underline">True</property>
+                            <items>
+                              <item id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</item>
+                              <item id="1" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</item>
+                              <item id="2" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</item>
+                              <item id="3" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</item>
+                              <item id="4" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Period</item>
+                            </items>
                             <child internal-child="accessible">
-                              <object class="AtkObject" id="PB_PERCENT_NUMBERFORMAT-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_PERCENT_NUMBERFORMAT">Opens a dialog to select the percentage format.</property>
+                              <object class="AtkObject" id="LB_TEXT_SEPARATOR-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_TEXT_SEPARATOR">Selects the separator between multiple text strings for the same object.</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="CT_LABEL_DIAL">
-                            <property name="can_focus">False</property>
-                            <property name="no_show_all">True</property>
-                            <property name="label" translatable="yes" context="dlg_DataLabel|CT_LABEL_DIAL">ABCD</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">5</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="boxPLACEMENT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
                         <child>
-                          <object class="GtkBox" id="boxSEPARATOR">
+                          <object class="GtkLabel" id="FT_LABEL_PLACEMENT">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="FT_TEXT_SEPARATOR">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" context="dlg_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="LB_TEXT_SEPARATOR">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <items>
-                                  <item id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</item>
-                                  <item id="1" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</item>
-                                  <item id="2" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</item>
-                                  <item id="3" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</item>
-                                  <item id="4" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Period</item>
-                                </items>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="LB_TEXT_SEPARATOR-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_TEXT_SEPARATOR">Selects the separator between multiple text strings for the same object.</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
-                            <property name="width">2</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="boxPLACEMENT">
+                          <object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="FT_LABEL_PLACEMENT">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
-                                <property name="xalign">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="valign">center</property>
-                                <items>
-                                  <item id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</item>
-                                  <item id="1" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</item>
-                                  <item id="2" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</item>
-                                  <item id="3" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</item>
-                                  <item id="4" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</item>
-                                  <item id="5" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</item>
-                                  <item id="6" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</item>
-                                  <item id="7" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</item>
-                                  <item id="8" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</item>
-                                  <item id="9" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</item>
-                                  <item id="10" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</item>
-                                  <item id="11" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</item>
-                                  <item id="12" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</item>
-                                </items>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="LB_LABEL_PLACEMENT-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_PLACEMENT">Selects the placement of data labels relative to the objects.</property>
-                                  </object>
-                                </child>
+                            <property name="valign">center</property>
+                            <items>
+                              <item id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</item>
+                              <item id="1" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</item>
+                              <item id="2" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</item>
+                              <item id="3" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</item>
+                              <item id="4" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</item>
+                              <item id="5" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</item>
+                              <item id="6" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</item>
+                              <item id="7" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</item>
+                              <item id="8" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</item>
+                              <item id="9" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</item>
+                              <item id="10" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</item>
+                              <item id="11" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</item>
+                              <item id="12" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</item>
+                            </items>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="LB_LABEL_PLACEMENT-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_PLACEMENT">Selects the placement of data labels relative to the objects.</property>
                               </object>
-                              <packing>
-                                <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">6</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="dlg_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">6</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" context="dlg_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
                     </child>
                   </object>
                 </child>
@@ -400,114 +394,103 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment2">
+                  <object class="GtkBox" id="box5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <object class="GtkBox" id="box5">
+                      <object class="GtkBox" id="boxORIENTATION">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
+                        <property name="spacing">12</property>
                         <child>
-                          <object class="GtkBox" id="boxORIENTATION">
+                          <object class="GtkDrawingArea" id="CT_DIAL">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkDrawingArea" id="CT_DIAL">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="CT_DIAL-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CT_DIAL">Click in the dial to set the text orientation for the data labels.</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="valign">center</property>
-                                <property name="activates_default">True</property>
-                                <property name="adjustment">adjustmentDEGREE</property>
-                                <property name="wrap">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="NF_LABEL_DEGREES-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|NF_LABEL_DEGREES">Enter the counterclockwise rotation angle for the data labels.</property>
-                                  </object>
-                                </child>
+                            <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="CT_DIAL-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CT_DIAL">Click in the dial to set the text orientation for the data labels.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkLabel" id="FT_LABEL_DEGREES">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_DEGREES">_Degrees</property>
-                                <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="valign">center</property>
+                            <property name="activates_default">True</property>
+                            <property name="adjustment">adjustmentDEGREE</property>
+                            <property name="wrap">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="NF_LABEL_DEGREES-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|NF_LABEL_DEGREES">Enter the counterclockwise rotation angle for the data labels.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="FT_LABEL_DEGREES">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_DEGREES">_Degrees</property>
+                            <property name="use_underline">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="boxTXT_DIRECTION">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_TEXTDIR">Te_xt direction</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">LB_LABEL_TEXTDIR</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="boxTXT_DIRECTION">
+                          <object class="GtkComboBoxText" id="LB_LABEL_TEXTDIR">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_TEXTDIR">Te_xt direction</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">LB_LABEL_TEXTDIR</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="LB_LABEL_TEXTDIR">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="no_show_all">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="LB_LABEL_TEXTDIR-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_TEXTDIR">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
-                                  </object>
-                                </child>
+                            <property name="no_show_all">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="LB_LABEL_TEXTDIR-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_TEXTDIR">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
                           </object>
                           <packing>
@@ -517,6 +500,11 @@
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
@@ -545,38 +533,32 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment3">
+                  <object class="GtkBox" id="box6">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
+                    <property name="orientation">vertical</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <object class="GtkBox" id="box6">
+                      <object class="GtkCheckButton" id="CB_CUSTOM_LEADER_LINES">
+                        <property name="label" translatable="yes" context="dlg_DataLabel|CB_CUSTOM_LEADER_LINES">_Connect displaced data labels to data points</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <child>
-                          <object class="GtkCheckButton" id="CB_CUSTOM_LEADER_LINES">
-                            <property name="label" translatable="yes" context="dlg_DataLabel|CB_CUSTOM_LEADER_LINES">_Connect displaced data labels to data points</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="CB_CUSTOM_LEADER_LINES-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CUSTOM_LEADER_LINES">Draws a line connecting the data labels to the data points</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="CB_CUSTOM_LEADER_LINES-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CUSTOM_LEADER_LINES">Draws a line connecting the data labels to the data points</property>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
diff --git a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
index 2ac56a4ad0fd..4024e3765760 100644
--- a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
+++ b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
@@ -112,63 +112,85 @@
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment1">
+                      <object class="GtkBox" id="box3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">12</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <property name="margin-start">12</property>
+                        <property name="margin-top">6</property>
                         <child>
-                          <object class="GtkBox" id="box3">
+                          <object class="GtkRadioButton" id="RB_NONE">
+                            <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NONE">_None</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkRadioButton" id="RB_NONE">
-                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NONE">_None</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="RB_NONE-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NONE">Does not show any error bars.</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="RB_NONE-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NONE">Does not show any error bars.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkRadioButton" id="RB_CONST">
-                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_CONST">_Constant Value</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>
-                                <property name="group">RB_NONE</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="RB_CONST-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_CONST">Displays constant values that you specify in the Parameters area.</property>
-                                  </object>
-                                </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="RB_CONST">
+                            <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_CONST">_Constant Value</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>
+                            <property name="group">RB_NONE</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="RB_CONST-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_CONST">Displays constant values that you specify in the Parameters area.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="RB_PERCENT">
+                            <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_PERCENT">_Percentage</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>
+                            <property name="group">RB_NONE</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="RB_PERCENT-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_PERCENT">Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area.</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box4">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkRadioButton" id="RB_PERCENT">
-                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_PERCENT">_Percentage</property>
+                              <object class="GtkRadioButton" id="RB_FUNCTION">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
@@ -177,95 +199,67 @@
                                 <property name="draw_indicator">True</property>
                                 <property name="group">RB_NONE</property>
                                 <child internal-child="accessible">
-                                  <object class="AtkObject" id="RB_PERCENT-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_PERCENT">Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area.</property>
+                                  <object class="AtkObject" id="RB_FUNCTION-atkobject">
+                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_FUNCTION">Select a function to calculate the error bars.</property>
                                   </object>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">2</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkBox" id="box4">
+                              <object class="GtkComboBoxText" id="LB_FUNCTION">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkRadioButton" id="RB_FUNCTION">
-                                    <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>
-                                    <property name="group">RB_NONE</property>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="RB_FUNCTION-atkobject">
-                                        <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_FUNCTION">Select a function to calculate the error bars.</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBoxText" id="LB_FUNCTION">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <items>
-                                      <item id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Error</item>
-                                      <item id="1" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Deviation</item>
-                                      <item id="2" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Variance</item>
-                                      <item id="3" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Error Margin</item>
-                                    </items>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="LB_FUNCTION-atkobject">
-                                        <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|LB_FUNCTION">Select a function to calculate the error bars.</property>
-                                      </object>
-                                    </child>
+                                <items>
+                                  <item id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Error</item>
+                                  <item id="1" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Deviation</item>
+                                  <item id="2" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Variance</item>
+                                  <item id="3" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Error Margin</item>
+                                </items>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="LB_FUNCTION-atkobject">
+                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|LB_FUNCTION">Select a function to calculate the error bars.</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">True</property>
-                                <property name="position">3</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkRadioButton" id="RB_RANGE">
-                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_RANGE">Cell _Range</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>
-                                <property name="group">RB_NONE</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="RB_RANGE-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_RANGE">Click Cell Range and then specify a cell range from which to take the positive and negative error bar values.</property>
-                                  </object>
-                                </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="RB_RANGE">
+                            <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_RANGE">Cell _Range</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>
+                            <property name="group">RB_NONE</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="RB_RANGE-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_RANGE">Click Cell Range and then specify a cell range from which to take the positive and negative error bar values.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">4</property>
-                              </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">4</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
@@ -293,114 +287,108 @@
                     <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="grid1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</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="GtkRadioButton" id="RB_BOTH">
+                            <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_BOTH">Positive _and Negative</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
-                            <child>
-                              <object class="GtkRadioButton" id="RB_BOTH">
-                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_BOTH">Positive _and Negative</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="RB_BOTH-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_BOTH">Shows positive and negative error bars.</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="RB_POSITIVE">
-                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_POSITIVE">Pos_itive</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>
-                                <property name="group">RB_BOTH</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="RB_POSITIVE-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_POSITIVE">Shows only positive error bars.</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkRadioButton" id="RB_NEGATIVE">
-                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NEGATIVE">Ne_gative</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>
-                                <property name="group">RB_BOTH</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="RB_NEGATIVE-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NEGATIVE">Shows only negative error bars.</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="RB_BOTH-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_BOTH">Shows positive and negative error bars.</property>
                               </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">2</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkImage" id="FI_BOTH">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="stock">gtk-missing-image</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkImage" id="FI_POSITIVE">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="stock">gtk-missing-image</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="RB_POSITIVE">
+                            <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_POSITIVE">Pos_itive</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>
+                            <property name="group">RB_BOTH</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="RB_POSITIVE-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_POSITIVE">Shows only positive error bars.</property>
                               </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkImage" id="FI_NEGATIVE">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="stock">gtk-missing-image</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="RB_NEGATIVE">
+                            <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NEGATIVE">Ne_gative</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>
+                            <property name="group">RB_BOTH</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="RB_NEGATIVE-atkobject">
+                                <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NEGATIVE">Shows only negative error bars.</property>
                               </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
-                              </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="FI_BOTH">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-missing-image</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="FI_POSITIVE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-missing-image</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkImage" id="FI_NEGATIVE">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="stock">gtk-missing-image</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">2</property>
+                          </packing>
                         </child>
                       </object>
                     </child>
@@ -436,91 +424,25 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment3">
+                  <object class="GtkBox" id="box5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="top_padding">6</property>
-                    <property name="left_padding">12</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">6</property>
                     <child>
-                      <object class="GtkBox" id="box5">
+                      <object class="GtkBox" id="boxPOSITIVE">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
+                        <property name="spacing">12</property>
                         <child>
-                          <object class="GtkBox" id="boxPOSITIVE">
+                          <object class="GtkLabel" id="FT_POSITIVE">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkLabel" id="FT_POSITIVE">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_POSITIVE">P_ositive (+)</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">MF_POSITIVE</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">