1 files changed, 136 insertions, 155 deletions
diff --git a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
index 2c68807be88e..bff800b3ff63 100644
--- a/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
+++ b/sw/uiconfig/swriter/ui/mmresultprintdialog.ui
@@ -96,70 +96,63 @@
             <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="grid5">
                 <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">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="grid5">
+                  <object class="GtkLabel" id="printerft">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" context="mmresultprintdialog|printerft">_Printer</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">printers</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="printers">
                     <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="GtkLabel" id="printerft">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="mmresultprintdialog|printerft">_Printer</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">printers</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="printers">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="printers-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printers">Select the printer.</property>
-                          </object>
-                        </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="printers-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printers">Select the printer.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkButton" id="printersettings">
-                        <property name="label" translatable="yes" context="mmresultprintdialog|printersettings">P_roperties...</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_underline">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="printersettings-atkobject">
-                            <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printersettings">Changes the printer properties.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="printersettings">
+                    <property name="label" translatable="yes" context="mmresultprintdialog|printersettings">P_roperties...</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_underline">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="printersettings-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printersettings">Changes the printer properties.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">0</property>
+                  </packing>
                 </child>
               </object>
             </child>
@@ -187,135 +180,123 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <property name="margin-start">12</property>
                 <child>
-                  <object class="GtkBox" id="box1">
+                  <object class="GtkRadioButton" id="printallrb">
+                    <property name="label" translatable="yes" context="mmresultprintdialog|printallrb">Print _all documents</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="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">fromrb</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="printallrb-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printallrb">Prints documents for all recipients.</property>
+                      </object>
+                    </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="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
+                    <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment3">
+                      <object class="GtkRadioButton" id="fromrb">
+                        <property name="label" translatable="yes" context="mmresultprintdialog|fromrb">_From</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkRadioButton" id="printallrb">
-                            <property name="label" translatable="yes" context="mmresultprintdialog|printallrb">Print _all documents</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="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">fromrb</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="printallrb-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|printallrb">Prints documents for all recipients.</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>
+                        <property name="group">printallrb</property>
+                        <accessibility>
+                          <relation type="label-for" target="from"/>
+                        </accessibility>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="fromrb-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|fromrb">Selects a range of records starting at the record number in the From box and ending at the record number in the To box.</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid3">
+                      <object class="GtkLabel" id="toft">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="column_spacing">12</property>
-                        <child>
-                          <object class="GtkRadioButton" id="fromrb">
-                            <property name="label" translatable="yes" context="mmresultprintdialog|fromrb">_From</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">printallrb</property>
-                            <accessibility>
-                              <relation type="label-for" target="from"/>
-                            </accessibility>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="fromrb-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|fromrb">Selects a range of records starting at the record number in the From box and ending at the record number in the To box.</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="toft">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" context="mmresultprintdialog|toft">_To</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">to</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="from">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="text">1</property>
-                            <property name="adjustment">adjustment1</property>
-                            <property name="value">1</property>
-                            <accessibility>
-                              <relation type="labelled-by" target="fromrb"/>
-                            </accessibility>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="from-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|from">Enter the number of the first record to include in the mail merge.</property>
-                              </object>
-                            </child>
+                        <property name="label" translatable="yes" context="mmresultprintdialog|toft">_To</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">to</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="from">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="text">1</property>
+                        <property name="adjustment">adjustment1</property>
+                        <property name="value">1</property>
+                        <accessibility>
+                          <relation type="labelled-by" target="fromrb"/>
+                        </accessibility>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="from-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|from">Enter the number of the first record to include in the mail merge.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkSpinButton" id="to">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="text">1</property>
-                            <property name="adjustment">adjustment2</property>
-                            <property name="value">1</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="to-atkobject">
-                                <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|to">Enter the number of the last record to include in the mail merge.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSpinButton" id="to">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="text">1</property>
+                        <property name="adjustment">adjustment2</property>
+                        <property name="value">1</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="to-atkobject">
+                            <property name="AtkObject::accessible-description" translatable="yes" context="mmresultprintdialog|extended_tip|to">Enter the number of the last record to include in the mail merge.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
             </child>