sw/uiconfig/swriter/ui/abstractdialog.ui           |  164 +--
 sw/uiconfig/swriter/ui/addentrydialog.ui           |   18 
 sw/uiconfig/swriter/ui/asciifilterdialog.ui        |  352 +++---
 sw/uiconfig/swriter/ui/assignstylesdialog.ui       |  426 ++++----
 sw/uiconfig/swriter/ui/autoformattable.ui          |  412 +++-----
 sw/uiconfig/swriter/ui/autotext.ui                 |  298 ++---
 sw/uiconfig/swriter/ui/bibliographyentry.ui        |  274 ++---
 sw/uiconfig/swriter/ui/businessdatapage.ui         |  790 +++++++--------
 sw/uiconfig/swriter/ui/captionoptions.ui           |  292 ++---
 sw/uiconfig/swriter/ui/cardmediumpage.ui           |  618 +++++-------
 sw/uiconfig/swriter/ui/ccdialog.ui                 |  151 +-
 sw/uiconfig/swriter/ui/charurlpage.ui              |  452 ++++----
 sw/uiconfig/swriter/ui/columnpage.ui               | 1075 ++++++++++-----------
 sw/uiconfig/swriter/ui/columnwidth.ui              |  124 +-
 sw/uiconfig/swriter/ui/conditionpage.ui            |  356 +++---
 sw/uiconfig/swriter/ui/converttexttable.ui         |  468 ++++-----
 sw/uiconfig/swriter/ui/createauthorentry.ui        |  178 +--
 sw/uiconfig/swriter/ui/createautomarkdialog.ui     |   16 
 sw/uiconfig/swriter/ui/dropcapspage.ui             |  420 +++-----
 sw/uiconfig/swriter/ui/dropdownfielddialog.ui      |   60 -
 sw/uiconfig/swriter/ui/editsectiondialog.ui        |  668 +++++--------
 sw/uiconfig/swriter/ui/endnotepage.ui              |  430 ++++----
 sw/uiconfig/swriter/ui/envformatpage.ui            |  792 +++++++--------
 sw/uiconfig/swriter/ui/envprinterpage.ui           |  609 +++++------
 sw/uiconfig/swriter/ui/exchangedatabases.ui        |  300 ++---
 sw/uiconfig/swriter/ui/footnoteareapage.ui         |  620 +++++-------
 sw/uiconfig/swriter/ui/footnotesendnotestabpage.ui |  622 +++++-------
 sw/uiconfig/swriter/ui/frmurlpage.ui               |  328 +++---
 sw/uiconfig/swriter/ui/indentpage.ui               |  167 +--
 sw/uiconfig/swriter/ui/indexentry.ui               |  792 +++++++--------
 sw/uiconfig/swriter/ui/insertautotextdialog.ui     |   54 -
 sw/uiconfig/swriter/ui/insertbreak.ui              |  276 ++---
 sw/uiconfig/swriter/ui/insertcaption.ui            |  344 +++---
 sw/uiconfig/swriter/ui/insertdbcolumnsdialog.ui    |  870 ++++++++--------
 sw/uiconfig/swriter/ui/insertfootnote.ui           |  270 ++---
 sw/uiconfig/swriter/ui/inserttable.ui              |  497 ++++-----
 sw/uiconfig/swriter/ui/labeloptionspage.ui         |  321 +++---
 sw/uiconfig/swriter/ui/linenumbering.ui            |  628 +++++-------
 sw/uiconfig/swriter/ui/mailconfigpage.ui           |  492 ++++-----
 sw/uiconfig/swriter/ui/mailmergedialog.ui          |   73 -
 sw/uiconfig/swriter/ui/mergeconnectdialog.ui       |  101 -
 sw/uiconfig/swriter/ui/mergetabledialog.ui         |   70 -
 sw/uiconfig/swriter/ui/mmmailbody.ui               |  482 ++++-----
 sw/uiconfig/swriter/ui/mmoutputtypepage.ui         |  164 +--
 sw/uiconfig/swriter/ui/mmresultsavedialog.ui       |  197 +--
 sw/uiconfig/swriter/ui/mmselectpage.ui             |  304 ++---
 sw/uiconfig/swriter/ui/mmsendmails.ui              |  232 ++--
 sw/uiconfig/swriter/ui/newuserindexdialog.ui       |   60 -
 sw/uiconfig/swriter/ui/numberingnamedialog.ui      |   98 -
 sw/uiconfig/swriter/ui/numparapage.ui              |  488 ++++-----
 sw/uiconfig/swriter/ui/optfonttabpage.ui           |  587 +++++------
 sw/uiconfig/swriter/ui/opttestpage.ui              |  354 +++---
 sw/uiconfig/swriter/ui/pagemargincontrol.ui        |  262 ++---
 sw/uiconfig/swriter/ui/picturepage.ui              |  468 ++++-----
 sw/uiconfig/swriter/ui/printeroptions.ui           |  250 ++--
 sw/uiconfig/swriter/ui/printoptionspage.ui         |  706 ++++++-------
 sw/uiconfig/swriter/ui/privateuserpage.ui          |  842 ++++++++--------
 sw/uiconfig/swriter/ui/renameentrydialog.ui        |   18 
 sw/uiconfig/swriter/ui/renameobjectdialog.ui       |   60 -
 sw/uiconfig/swriter/ui/rowheight.ui                |   82 -
 sw/uiconfig/swriter/ui/savelabeldialog.ui          |  124 +-
 sw/uiconfig/swriter/ui/selectautotextdialog.ui     |   48 
 sw/uiconfig/swriter/ui/selectblockdialog.ui        |  166 +--
 sw/uiconfig/swriter/ui/selectindexdialog.ui        |   90 -
 sw/uiconfig/swriter/ui/sidebarstylepresets.ui      |   50 
 sw/uiconfig/swriter/ui/sidebartheme.ui             |  180 +--
 sw/uiconfig/swriter/ui/splittable.ui               |  164 +--
 sw/uiconfig/swriter/ui/tablecolumnpage.ui          |  499 ++++-----
 sw/uiconfig/swriter/ui/tabletextflowpage.ui        |  689 ++++++-------
 sw/uiconfig/swriter/ui/testmailsettings.ui         |  232 ++--
 sw/uiconfig/swriter/ui/textgridpage.ui             |  766 +++++++-------
 sw/uiconfig/swriter/ui/tocstylespage.ui            |  304 ++---
 sw/uiconfig/swriter/ui/viewoptionspage.ui          |  696 ++++++-------
 sw/uiconfig/swriter/ui/wrappage.ui                 |  745 +++++++-------
 74 files changed, 12892 insertions(+), 13783 deletions(-)

New commits:
commit 83de497ae90f69118c35121bc228f15fbb5c5623
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 31 20:21:34 2020 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 2 12:49:26 2021 +0100

    drop deprecated GtkAlignment, move left/top-padding into child 
margin-start/top
    
    for sw part a
    
    Change-Id: I27a3bbd46ba87e67c4a0d109fb661e2228f38ce5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108564
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/uiconfig/swriter/ui/abstractdialog.ui 
b/sw/uiconfig/swriter/ui/abstractdialog.ui
index e6e1e57fee89..f1f412167dd5 100644
--- a/sw/uiconfig/swriter/ui/abstractdialog.ui
+++ b/sw/uiconfig/swriter/ui/abstractdialog.ui
@@ -95,105 +95,97 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <!-- n-columns=1 n-rows=1 -->
+              <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="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="grid1">
+                  <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes" 
context="abstractdialog|label2">Included outline levels</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">outlines</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="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes" 
context="abstractdialog|label3">Paragraphs per level</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">paras</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="label" translatable="yes" 
context="abstractdialog|label4">The abstract contains the selected number of 
paragraphs from the included outline levels.</property>
-                        <property name="use_underline">True</property>
-                        <property name="wrap">True</property>
-                        <property name="width_chars">52</property>
-                        <property name="max_width_chars">52</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="outlines">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="halign">end</property>
-                        <property name="adjustment">adjustment1</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="outlines-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="abstractdialog|extended_tip|outlines">Enter the 
extent of the outline levels to be copied to the new document.</property>
-                          </object>
-                        </child>
+                    <property name="label" translatable="yes" 
context="abstractdialog|label2">Included outline levels</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">outlines</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="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes" 
context="abstractdialog|label3">Paragraphs per level</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">paras</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes" 
context="abstractdialog|label4">The abstract contains the selected number of 
paragraphs from the included outline levels.</property>
+                    <property name="use_underline">True</property>
+                    <property name="wrap">True</property>
+                    <property name="width_chars">52</property>
+                    <property name="max_width_chars">52</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="outlines">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">end</property>
+                    <property name="adjustment">adjustment1</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="outlines-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="abstractdialog|extended_tip|outlines">Enter the 
extent of the outline levels to be copied to the new document.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkSpinButton" id="paras">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="halign">end</property>
-                        <property name="adjustment">adjustment2</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="paras-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="abstractdialog|extended_tip|paras">Specify the 
maximum number of consecutive paragraphs to be included in the AutoAbstract 
document after each heading.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="paras">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="halign">end</property>
+                    <property name="adjustment">adjustment2</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="paras-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="abstractdialog|extended_tip|paras">Specify the 
maximum number of consecutive paragraphs to be included in the AutoAbstract 
document after each heading.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
                 </child>
               </object>
             </child>
diff --git a/sw/uiconfig/swriter/ui/addentrydialog.ui 
b/sw/uiconfig/swriter/ui/addentrydialog.ui
index cbf9d5b33ca0..083e01db9fa8 100644
--- a/sw/uiconfig/swriter/ui/addentrydialog.ui
+++ b/sw/uiconfig/swriter/ui/addentrydialog.ui
@@ -83,19 +83,13 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <object class="GtkEntry" id="entry">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkEntry" id="entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="valign">start</property>
-                    <property name="activates_default">True</property>
-                  </object>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="valign">start</property>
+                <property name="activates_default">True</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">6</property>
               </object>
             </child>
             <child type="label">
diff --git a/sw/uiconfig/swriter/ui/asciifilterdialog.ui 
b/sw/uiconfig/swriter/ui/asciifilterdialog.ui
index 77a3cbd8445f..1160b68e75b6 100644
--- a/sw/uiconfig/swriter/ui/asciifilterdialog.ui
+++ b/sw/uiconfig/swriter/ui/asciifilterdialog.ui
@@ -81,227 +81,221 @@
             <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="valign">start</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="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="valign">start</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <property name="label" translatable="yes" 
context="asciifilterdialog|label2">_Character set:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">charset</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="fontft">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <property name="label" translatable="yes" 
context="asciifilterdialog|fontft">Default fonts:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">font</property>
+                    <property name="halign">end</property>
+                    <property name="label" translatable="yes" 
context="asciifilterdialog|label2">_Character set:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">charset</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="fontft">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="label" translatable="yes" 
context="asciifilterdialog|fontft">Default fonts:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">font</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="languageft">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="label" translatable="yes" 
context="asciifilterdialog|languageft">Lan_guage:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">language</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">end</property>
+                    <property name="label" translatable="yes" 
context="asciifilterdialog|label5">_Paragraph break:</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="charset">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="charset-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|charset">Specifies 
the character set of the file for export or import.</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="languageft">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <property name="label" translatable="yes" 
context="asciifilterdialog|languageft">Lan_guage:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">language</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="font">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="font-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|font">By setting a 
default font, you specify that the text should be displayed in a specific font. 
The default fonts can only be selected when importing.</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">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="spacing">12</property>
                     <child>
-                      <object class="GtkLabel" id="label5">
+                      <object class="GtkRadioButton" id="crlf">
+                        <property name="label" translatable="yes" 
context="asciifilterdialog|crlf">_CR &amp; LF</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <property name="label" translatable="yes" 
context="asciifilterdialog|label5">_Paragraph break:</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="charset">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="charset-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|charset">Specifies 
the character set of the file for export or import.</property>
+                          <object class="AtkObject" id="crlf-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|crlf">Produces a 
"Carriage Return" and a "Linefeed". This option is the default.</property>
                           </object>
                         </child>
                       </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="GtkComboBoxText" id="font">
+                      <object class="GtkRadioButton" id="cr">
+                        <property name="label" translatable="yes" 
context="asciifilterdialog|cr">C_R</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="halign">center</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">crlf</property>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="font-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|font">By setting a 
default font, you specify that the text should be displayed in a specific font. 
The default fonts can only be selected when importing.</property>
+                          <object class="AtkObject" id="cr-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|cr">Produces a 
"Carriage Return" as the paragraph break.</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox" id="box1">
+                      <object class="GtkRadioButton" id="lf">
+                        <property name="label" translatable="yes" 
context="asciifilterdialog|lf">_LF</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkRadioButton" id="crlf">
-                            <property name="label" translatable="yes" 
context="asciifilterdialog|crlf">_CR &amp; LF</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>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="crlf-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="asciifilterdialog|extended_tip|crlf">Produces a "Carriage Return" and 
a "Linefeed". This option is the default.</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="cr">
-                            <property name="label" translatable="yes" 
context="asciifilterdialog|cr">C_R</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">center</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">crlf</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="cr-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="asciifilterdialog|extended_tip|cr">Produces a "Carriage Return" as the 
paragraph break.</property>
-                              </object>
-                            </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="lf">
-                            <property name="label" translatable="yes" 
context="asciifilterdialog|lf">_LF</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="halign">end</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">crlf</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="lf-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="asciifilterdialog|extended_tip|lf">Produces a "Linefeed" as the 
paragraph break.</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="language">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="has_entry">True</property>
-                        <child internal-child="entry">
-                          <object class="GtkEntry">
-                            <property name="can_focus">True</property>
-                            <property name="activates_default">True</property>
-                          </object>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="halign">end</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">crlf</property>
                         <child internal-child="accessible">
-                          <object class="AtkObject" id="language-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|language">Specifies 
the language of the text, if this has not already been defined. This setting is 
only available when importing.</property>
+                          <object class="AtkObject" id="lf-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|lf">Produces a 
"Linefeed" as the paragraph break.</property>
                           </object>
                         </child>
                       </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">2</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="includebom">
-                        <property name="label" translatable="yes" 
context="asciifilterdialog|includebom">Include byte-order mark</property>
-                        <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="language">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="has_entry">True</property>
+                    <child internal-child="entry">
+                      <object class="GtkEntry">
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="halign">start</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="activates_default">True</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">4</property>
-                      </packing>
                     </child>
-                    <child>
-                      <placeholder/>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="language-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="asciifilterdialog|extended_tip|language">Specifies 
the language of the text, if this has not already been defined. This setting is 
only available when importing.</property>
+                      </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="includebom">
+                    <property name="label" translatable="yes" 
context="asciifilterdialog|includebom">Include byte-order mark</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
                 </child>
               </object>
             </child>
diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui 
b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
index 33902bf15a0e..ddda661d5373 100644
--- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
@@ -165,296 +165,288 @@
             <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="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="margin-start">12</property>
+                <property name="margin-top">6</property>
                 <child>
                   <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid" id="grid1">
+                  <object class="GtkGrid" id="grid2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <property name="row_spacing">6</property>
+                    <property name="halign">start</property>
+                    <property name="column_spacing">12</property>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid2">
+                      <object class="GtkButtonBox" id="buttonbox1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
-                        <property name="column_spacing">12</property>
+                        <property name="spacing">12</property>
+                        <property name="layout_style">start</property>
                         <child>
-                          <object class="GtkButtonBox" id="buttonbox1">
+                          <object class="GtkButton" id="left">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="spacing">12</property>
-                            <property name="layout_style">start</property>
-                            <child>
-                              <object class="GtkButton" id="left">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">True</property>
-                                <property name="tooltip_text" 
translatable="yes" context="assignstylesdialog|left|tooltip_text">Promote 
level</property>
-                                <property name="image">image1</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" 
id="left-atkobject">
-                                    <property 
name="AtkObject::accessible-name" translatable="yes" 
context="assignstylesdialog|left-atkobject">Left</property>
-                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="assignstylesdialog|extended_tip|left">Moves the selected paragraph 
style up one level in the index hierarchy.</property>
-                                  </object>
-                                </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes" 
context="assignstylesdialog|left|tooltip_text">Promote level</property>
+                            <property name="image">image1</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="left-atkobject">
+                                <property name="AtkObject::accessible-name" 
translatable="yes" context="assignstylesdialog|left-atkobject">Left</property>
+                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="assignstylesdialog|extended_tip|left">Moves the selected paragraph 
style up one level in the index hierarchy.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkButton" id="right">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">True</property>
-                                <property name="tooltip_text" 
translatable="yes" context="assignstylesdialog|right|tooltip_text">Demote 
level</property>
-                                <property name="image">image2</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" 
id="right-atkobject">
-                                    <property 
name="AtkObject::accessible-name" translatable="yes" 
context="assignstylesdialog|right-atkobject">Right</property>
-                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="assignstylesdialog|extended_tip|right">Moves the selected paragraph 
style down one level in the index hierarchy.</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="GtkButton" id="right">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes" 
context="assignstylesdialog|right|tooltip_text">Demote level</property>
+                            <property name="image">image2</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="right-atkobject">
+                                <property name="AtkObject::accessible-name" 
translatable="yes" context="assignstylesdialog|right-atkobject">Right</property>
+                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="assignstylesdialog|extended_tip|right">Moves the selected paragraph 
style down one level in the index hierarchy.</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">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
+                        <property name="top_attach">0</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkScrolledWindow">
+                      <object class="GtkTreeView" id="styles">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
-                        <property name="shadow_type">in</property>
+                        <property name="model">liststore1</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="Macro Library 
List-selection1"/>
+                        </child>
                         <child>
-                          <object class="GtkTreeView" id="styles">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="model">liststore1</property>
-                            <property name="search_column">0</property>
-                            <property name="show_expanders">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="Macro 
Library List-selection1"/>
-                            </child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn1">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="title" translatable="yes" 
context="assignstylesdialog|stylecolumn">Style</property>
+                            <property name="sort_indicator">True</property>
+                            <property name="sort_column_id">0</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn1">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="title" translatable="yes" 
context="assignstylesdialog|stylecolumn">Style</property>
-                                <property name="sort_indicator">True</property>
-                                <property name="sort_column_id">0</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="cellrenderer1"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
+                              <object class="GtkCellRendererText" 
id="cellrenderer1"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn2">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn2">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer2">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">1</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer2">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">1</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn3">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn3">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer3">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">2</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer3">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">2</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn4">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn4">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer4">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">3</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer4">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">3</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn5">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn5">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer5">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">4</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer5">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">4</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn6">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn6">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer6">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">5</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer6">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">5</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn7">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn7">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer7">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">6</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer7">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">6</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn8">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn8">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer8">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">7</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer8">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">7</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn9">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn9">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer9">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">8</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer9">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">8</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn10">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn10">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer10">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">9</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer10">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">9</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn11">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn11">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer11">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">10</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer11">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">10</attribute>
+                              </attributes>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn12">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn12">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <property name="alignment">0.5</property>
-                                <child>
-                                  <object class="GtkCellRendererToggle" 
id="cellrenderer12">
-                                    <property name="radio">True</property>
-                                  </object>
-                                  <attributes>
-                                    <attribute name="active">11</attribute>
-                                  </attributes>
-                                </child>
+                              <object class="GtkCellRendererToggle" 
id="cellrenderer12">
+                                <property name="radio">True</property>
                               </object>
+                              <attributes>
+                                <attribute name="active">11</attribute>
+                              </attributes>
                             </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
                 </child>
               </object>
             </child>
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui 
b/sw/uiconfig/swriter/ui/autoformattable.ui
index ad483615d150..bcb12d32f121 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -103,87 +103,77 @@
                 <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">
                     <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="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">
+                      <object class="GtkGrid" id="grid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="column_spacing">12</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">6</property>
+                        <property name="column_homogeneous">True</property>
                         <child>
-                          <!-- n-columns=1 n-rows=1 -->
-                          <object class="GtkGrid" id="grid2">
+                          <object class="GtkDrawingArea" id="preview">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">6</property>
-                            <property name="column_homogeneous">True</property>
-                            <child>
-                              <object class="GtkDrawingArea" id="preview">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" 
id="preview-atkobject">
-                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|preview">Displays a preview of the 
current selection.</property>
-                                  </object>
-                                </child>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="preview-atkobject">
+                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|preview">Displays a preview of the 
current selection.</property>
                               </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
                             </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkScrolledWindow">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkScrolledWindow">
+                              <object class="GtkTreeView" id="formatlb">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="hexpand">True</property>
                                 <property name="vexpand">True</property>
-                                <property name="shadow_type">in</property>
+                                <property name="model">liststore1</property>
+                                <property 
name="headers_visible">False</property>
+                                <property 
name="headers_clickable">False</property>
+                                <property name="search_column">0</property>
+                                <property 
name="show_expanders">False</property>
+                                <child internal-child="selection">
+                                  <object class="GtkTreeSelection" 
id="treeview-selection1"/>
+                                </child>
                                 <child>
-                                  <object class="GtkTreeView" id="formatlb">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="vexpand">True</property>
-                                    <property 
name="model">liststore1</property>
-                                    <property 
name="headers_visible">False</property>
-                                    <property 
name="headers_clickable">False</property>
-                                    <property name="search_column">0</property>
-                                    <property 
name="show_expanders">False</property>
-                                    <child internal-child="selection">
-                                      <object class="GtkTreeSelection" 
id="treeview-selection1"/>
-                                    </child>
+                                  <object class="GtkTreeViewColumn" 
id="treeviewcolumn1">
                                     <child>
-                                      <object class="GtkTreeViewColumn" 
id="treeviewcolumn1">
-                                        <child>
-                                          <object class="GtkCellRendererText" 
id="cellrenderertext1"/>
-                                          <attributes>
-                                            <attribute 
name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" 
id="formatlb-atkobject">
-                                        <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|formatlb">Lists the available formatting 
styles for tables. Click the format that you want to apply, and then click 
OK.</property>
-                                      </object>
+                                      <object class="GtkCellRendererText" 
id="cellrenderertext1"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
                                     </child>
                                   </object>
                                 </child>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" 
id="formatlb-atkobject">
+                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|formatlb">Lists the available formatting 
styles for tables. Click the format that you want to apply, and then click 
OK.</property>
+                                  </object>
+                                </child>
                               </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                              </packing>
                             </child>
                           </object>
                           <packing>
@@ -191,71 +181,75 @@
                             <property name="top_attach">0</property>
                           </packing>
                         </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButtonBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <property name="layout_style">start</property>
                         <child>
-                          <object class="GtkButtonBox">
+                          <object class="GtkButton" id="add">
+                            <property name="label">gtk-add</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <property name="layout_style">start</property>
-                            <child>
-                              <object class="GtkButton" id="add">
-                                <property name="label">gtk-add</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">False</property>
-                                <property name="use_stock">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="add-atkobject">
-                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|add">Adds a new table style to the 
list.</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="GtkButton" id="remove">
-                                <property name="label">gtk-delete</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">False</property>
-                                <property name="use_stock">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" 
id="remove-atkobject">
-                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|remove">Deletes the selected element or 
elements after confirmation.</property>
-                                  </object>
-                                </child>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_stock">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="add-atkobject">
+                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|add">Adds a new table style to the 
list.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
-                            <child>
-                              <object class="GtkButton" id="rename">
-                                <property name="label" translatable="yes" 
context="autoformattable|rename">Rename</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="remove">
+                            <property name="label">gtk-delete</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_stock">True</property>
+                            <child internal-child="accessible">
+                              <object class="AtkObject" id="remove-atkobject">
+                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|remove">Deletes the selected element or 
elements after confirmation.</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
                           </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">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="rename">
+                            <property name="label" translatable="yes" 
context="autoformattable|rename">Rename</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
@@ -283,122 +277,116 @@
                 <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="grid4">
                     <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="grid4">
+                      <object class="GtkCheckButton" id="numformatcb">
+                        <property name="label" translatable="yes" 
context="autoformattable|numformatcb">Number format</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="GtkCheckButton" id="numformatcb">
-                            <property name="label" translatable="yes" 
context="autoformattable|numformatcb">Number format</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="numformatcb-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|numformatcb">Includes numbering formats 
in the selected table style.</property>
-                              </object>
-                            </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="numformatcb-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="autoformattable|extended_tip|numformatcb">Includes 
numbering formats in the selected table style.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="bordercb">
-                            <property name="label" translatable="yes" 
context="autoformattable|bordercb">Borders</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="bordercb-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|bordercb">Includes border styles in the 
selected table style.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="bordercb">
+                        <property name="label" translatable="yes" 
context="autoformattable|bordercb">Borders</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="bordercb-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="autoformattable|extended_tip|bordercb">Includes 
border styles in the selected table style.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="fontcb">
-                            <property name="label" translatable="yes" 
context="autoformattable|fontcb">Font</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="fontcb-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|fontcb">Includes font formatting in the 
selected table style.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="fontcb">
+                        <property name="label" translatable="yes" 
context="autoformattable|fontcb">Font</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="fontcb-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="autoformattable|extended_tip|fontcb">Includes font 
formatting in the selected table style.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="patterncb">
-                            <property name="label" translatable="yes" 
context="autoformattable|patterncb">Pattern</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="patterncb-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="autoformattable|extended_tip|patterncb">Includes background styles in 
the selected table style.</property>
-                              </object>
-                            </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="patterncb">
+                        <property name="label" translatable="yes" 
context="autoformattable|patterncb">Pattern</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="patterncb-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="autoformattable|extended_tip|patterncb">Includes 
background styles in the selected table style.</property>
                           </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="alignmentcb">
-                            <property name="label" translatable="yes" 
context="autoformattable|alignmentcb">Alignment</property>

... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to