cui/uiconfig/ui/aboutconfigdialog.ui      |  232 +++----
 cui/uiconfig/ui/accelconfigpage.ui        |  392 +++++-------
 cui/uiconfig/ui/acorexceptpage.ui         |  478 +++++++-------
 cui/uiconfig/ui/agingdialog.ui            |  104 +--
 cui/uiconfig/ui/applylocalizedpage.ui     |  468 +++++++-------
 cui/uiconfig/ui/asiantypography.ui        |  110 +--
 cui/uiconfig/ui/certdialog.ui             |  178 ++---
 cui/uiconfig/ui/comment.ui                |  188 ++---
 cui/uiconfig/ui/connpooloptions.ui        |  321 ++++-----
 cui/uiconfig/ui/dbregisterpage.ui         |  215 +++---
 cui/uiconfig/ui/dimensionlinestabpage.ui  |  664 +++++++++-----------
 cui/uiconfig/ui/editmodulesdialog.ui      |  318 ++++-----
 cui/uiconfig/ui/embossdialog.ui           |  116 +--
 cui/uiconfig/ui/fmsearchdialog.ui         |  920 +++++++++++++---------------
 cui/uiconfig/ui/fontfeaturesdialog.ui     |   30 
 cui/uiconfig/ui/galleryapplyprogress.ui   |   14 
 cui/uiconfig/ui/galleryupdateprogress.ui  |   14 
 cui/uiconfig/ui/hangulhanjaadddialog.ui   |   68 --
 cui/uiconfig/ui/iconselectordialog.ui     |   42 -
 cui/uiconfig/ui/lineendstabpage.ui        |  372 +++++------
 cui/uiconfig/ui/linestyletabpage.ui       |  622 +++++++++----------
 cui/uiconfig/ui/linetabpage.ui            |  976 ++++++++++++++----------------
 cui/uiconfig/ui/mosaicdialog.ui           |  206 +++---
 cui/uiconfig/ui/multipathdialog.ui        |  180 ++---
 cui/uiconfig/ui/optemailpage.ui           |  292 ++++----
 cui/uiconfig/ui/optnewdictionarydialog.ui |  170 ++---
 cui/uiconfig/ui/optopenclpage.ui          |   89 +-
 cui/uiconfig/ui/optpathspage.ui           |  140 ++--
 cui/uiconfig/ui/optproxypage.ui           |  535 ++++++++--------
 cui/uiconfig/ui/pastespecial.ui           |   56 -
 cui/uiconfig/ui/percentdialog.ui          |   22 
 cui/uiconfig/ui/personalization_tab.ui    |  276 ++++----
 cui/uiconfig/ui/pickbulletpage.ui         |   42 -
 cui/uiconfig/ui/pickgraphicpage.ui        |  122 +--
 cui/uiconfig/ui/picknumberingpage.ui      |   42 -
 cui/uiconfig/ui/pickoutlinepage.ui        |   42 -
 cui/uiconfig/ui/posterdialog.ui           |  104 +--
 cui/uiconfig/ui/qrcodegen.ui              |  322 ++++-----
 cui/uiconfig/ui/rotationtabpage.ui        |  370 +++++------
 cui/uiconfig/ui/scriptorganizer.ui        |  220 +++---
 cui/uiconfig/ui/selectpathdialog.ui       |  156 ++--
 cui/uiconfig/ui/smarttagoptionspage.ui    |  126 +--
 cui/uiconfig/ui/smoothdialog.ui           |   96 +-
 cui/uiconfig/ui/solarizedialog.ui         |  142 ++--
 cui/uiconfig/ui/transparencytabpage.ui    |  835 ++++++++++++-------------
 cui/uiconfig/ui/tsaurldialog.ui           |  144 ++--
 cui/uiconfig/ui/wordcompletionpage.ui     |  260 +++----
 cui/uiconfig/ui/zoomdialog.ui             |  444 ++++++-------
 48 files changed, 5895 insertions(+), 6380 deletions(-)

New commits:
commit 0cb58b2a605529cf59c0e445fc86dca4c92816e7
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jan 2 17:18:41 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Jan 3 16:00:58 2021 +0100

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

diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui 
b/cui/uiconfig/ui/aboutconfigdialog.ui
index b71ad86717d6..786eb042a805 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -123,165 +123,159 @@
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment" id="alignment1">
+          <object class="GtkBox" id="box1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <child>
-              <object class="GtkBox" id="box1">
+              <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="GtkBox" id="box2">
+                  <object class="GtkEntry" id="searchEntry">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkEntry" id="searchEntry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="activates_default">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="searchEntry-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|searchEntry">Type the preference you 
want to display in the text area</property>
-                          </object>
-                        </child>
+                    <property name="can_focus">True</property>
+                    <property name="activates_default">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="searchEntry-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|searchEntry">Type the preference you 
want to display in the text area</property>
                       </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkButton" id="searchButton">
-                        <property name="label" translatable="yes" 
context="aboutconfigdialog|searchButton">_Search</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="has_default">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_underline">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" 
id="searchButton-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|searchButton">Click to search your 
preference text in the Preferences tree.</property>
-                          </object>
-                        </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="searchButton">
+                    <property name="label" translatable="yes" 
context="aboutconfigdialog|searchButton">_Search</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="has_default">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_underline">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="searchButton-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|searchButton">Click to search your 
preference text in the Preferences tree.</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="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="preferences">
+                    <property name="width_request">-1</property>
                     <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">1</property>
+                    <property name="enable_tree_lines">True</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="Macro Library 
List-selection1"/>
+                    </child>
                     <child>
-                      <object class="GtkTreeView" id="preferences">
-                        <property name="width_request">-1</property>
-                        <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">1</property>
-                        <property name="enable_tree_lines">True</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="Macro Library 
List-selection1"/>
-                        </child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                        <property name="resizable">True</property>
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes" 
context="aboutconfigdialog|preference">Preference Name</property>
+                        <property name="clickable">True</property>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn2">
-                            <property name="resizable">True</property>
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes" 
context="aboutconfigdialog|preference">Preference Name</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererPixbuf" 
id="cellrenderertext4"/>
-                              <attributes>
-                                <attribute name="pixbuf">0</attribute>
-                              </attributes>
-                            </child>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderertext2"/>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
+                          <object class="GtkCellRendererPixbuf" 
id="cellrenderertext4"/>
+                          <attributes>
+                            <attribute name="pixbuf">0</attribute>
+                          </attributes>
                         </child>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn3">
-                            <property name="resizable">True</property>
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes" 
context="aboutconfigdialog|property">Property</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderertext3"/>
-                              <attributes>
-                                <attribute name="text">2</attribute>
-                              </attributes>
-                            </child>
-                          </object>
+                          <object class="GtkCellRendererText" 
id="cellrenderertext2"/>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+                        <property name="resizable">True</property>
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes" 
context="aboutconfigdialog|property">Property</property>
+                        <property name="clickable">True</property>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn4">
-                            <property name="resizable">True</property>
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes" 
context="aboutconfigdialog|type">Type</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderertext1"/>
-                              <attributes>
-                                <attribute name="text">3</attribute>
-                              </attributes>
-                            </child>
-                          </object>
+                          <object class="GtkCellRendererText" 
id="cellrenderertext3"/>
+                          <attributes>
+                            <attribute name="text">2</attribute>
+                          </attributes>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+                        <property name="resizable">True</property>
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes" 
context="aboutconfigdialog|type">Type</property>
+                        <property name="clickable">True</property>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn5">
-                            <property name="resizable">True</property>
-                            <property name="spacing">6</property>
-                            <property name="title" translatable="yes" 
context="aboutconfigdialog|value">Value</property>
-                            <property name="clickable">True</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderertext5"/>
-                              <attributes>
-                                <attribute name="text">4</attribute>
-                              </attributes>
-                            </child>
-                          </object>
+                          <object class="GtkCellRendererText" 
id="cellrenderertext1"/>
+                          <attributes>
+                            <attribute name="text">3</attribute>
+                          </attributes>
                         </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="preferences-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|preferences">List the preferences 
organized hierarchically in a tree layout.</property>
-                          </object>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn5">
+                        <property name="resizable">True</property>
+                        <property name="spacing">6</property>
+                        <property name="title" translatable="yes" 
context="aboutconfigdialog|value">Value</property>
+                        <property name="clickable">True</property>
+                        <child>
+                          <object class="GtkCellRendererText" 
id="cellrenderertext5"/>
+                          <attributes>
+                            <attribute name="text">4</attribute>
+                          </attributes>
                         </child>
                       </object>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="preferences-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="extended_tip|preferences">List the preferences 
organized hierarchically in a tree layout.</property>
+                      </object>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
             </child>
           </object>
           <packing>
diff --git a/cui/uiconfig/ui/accelconfigpage.ui 
b/cui/uiconfig/ui/accelconfigpage.ui
index 28afcf5ee842..bfc2d0544fb1 100644
--- a/cui/uiconfig/ui/accelconfigpage.ui
+++ b/cui/uiconfig/ui/accelconfigpage.ui
@@ -67,67 +67,57 @@
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="alignment4">
+              <object class="GtkScrolledWindow">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="top_padding">6</property>
+                <property name="shadow_type">in</property>
+                <property name="margin-top">6</property>
                 <child>
-                  <object class="GtkScrolledWindow">
+                  <object class="GtkTreeView" id="shortcuts">
                     <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">liststore3</property>
+                    <property name="headers_visible">False</property>
+                    <property name="search_column">0</property>
+                    <property name="show_expanders">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="Macro Library 
List-selection2"/>
+                    </child>
                     <child>
-                      <object class="GtkTreeView" id="shortcuts">
-                        <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">liststore3</property>
-                        <property name="headers_visible">False</property>
-                        <property name="search_column">0</property>
-                        <property name="show_expanders">False</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="Macro Library 
List-selection2"/>
-                        </child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn3">
+                        <property name="resizable">True</property>
+                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn3">
-                            <property name="resizable">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderer1"/>
-                              <attributes>
-                                <attribute name="sensitive">5</attribute>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
+                          <object class="GtkCellRendererText" 
id="cellrenderer1"/>
+                          <attributes>
+                            <attribute name="sensitive">5</attribute>
+                            <attribute name="text">0</attribute>
+                          </attributes>
                         </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+                        <property name="resizable">True</property>
+                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn4">
-                            <property name="resizable">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderer2"/>
-                              <attributes>
-                                <attribute name="text">1</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="shortcuts-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="accelconfigpage|extended_tip|shortcuts">Lists the 
shortcut keys and the associated commands. To assign or modify the shortcut key 
for the command selected in the Function list, click a shortcut in this list, 
and then click Modify.</property>
-                          </object>
+                          <object class="GtkCellRendererText" 
id="cellrenderer2"/>
+                          <attributes>
+                            <attribute name="text">1</attribute>
+                          </attributes>
                         </child>
                       </object>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="shortcuts-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="accelconfigpage|extended_tip|shortcuts">Lists the 
shortcut keys and the associated commands. To assign or modify the shortcut key 
for the command selected in the Function list, click a shortcut in this list, 
and then click Modify.</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -346,224 +336,216 @@
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
-          <object class="GtkAlignment" id="alignment5">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="margin-top">6</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="top_padding">6</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkEntry" id="searchEntry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="margin_bottom">5</property>
+                <property name="placeholder_text" translatable="yes" 
context="accelconfigpage|searchEntry">Type to search</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <!-- n-columns=1 n-rows=1 -->
+              <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</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="GtkEntry" id="searchEntry">
+                  <object class="GtkLabel" id="label23">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="margin_bottom">5</property>
-                    <property name="placeholder_text" translatable="yes" 
context="accelconfigpage|searchEntry">Type to search</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" 
context="accelconfigpage|label23">_Category</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">category</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                   </packing>
                 </child>
                 <child>
-                  <!-- n-columns=1 n-rows=1 -->
-                  <object class="GtkGrid" id="grid1">
+                  <object class="GtkLabel" id="label24">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" 
context="accelconfigpage|label24">_Function</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">function</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label25">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes" 
context="accelconfigpage|label25">_Keys</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">keys</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</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="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label23">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" 
context="accelconfigpage|label23">_Category</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">category</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="label24">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" 
context="accelconfigpage|label24">_Function</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">function</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label25">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" 
context="accelconfigpage|label25">_Keys</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">keys</property>
-                        <property name="xalign">0</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkScrolledWindow">
+                      <object class="GtkTreeView" id="category">
                         <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="headers_visible">False</property>
+                        <property name="search_column">0</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="Macro Library 
List-selection1"/>
+                        </child>
                         <child>
-                          <object class="GtkTreeView" id="category">
-                            <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="headers_visible">False</property>
-                            <property name="search_column">0</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>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn1">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="cellrenderer4"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="category-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="accelconfigpage|extended_tip|category">Lists the available function 
categories. To assign shortcuts to Styles, open the "Styles" 
category.</property>
-                              </object>
+                              <object class="GtkCellRendererText" 
id="cellrenderer4"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
                             </child>
                           </object>
                         </child>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="category-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="accelconfigpage|extended_tip|category">Lists the 
available function categories. To assign shortcuts to Styles, open the "Styles" 
category.</property>
+                          </object>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="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="function">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="has_tooltip">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
-                        <property name="shadow_type">in</property>
+                        <property name="model">liststore2</property>
+                        <property name="headers_visible">False</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="Macro Library 
List-selection3"/>
+                        </child>
                         <child>
-                          <object class="GtkTreeView" id="function">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="has_tooltip">True</property>
-                            <property name="hexpand">True</property>
-                            <property name="vexpand">True</property>
-                            <property name="model">liststore2</property>
-                            <property name="headers_visible">False</property>
-                            <property name="search_column">0</property>
-                            <property name="show_expanders">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="Macro 
Library List-selection3"/>
-                            </child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn5">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn5">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="cellrenderer5"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                            </child>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" 
id="function-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="accelconfigpage|extended_tip|function">Select a function that you want 
to assign a shortcut key to, click a key combination in the Shortcut keys list, 
and then click Modify. If the selected function already has a shortcut key, it 
is displayed in the Keys list.</property>
-                              </object>
+                              <object class="GtkCellRendererText" 
id="cellrenderer5"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
                             </child>
                           </object>
                         </child>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="function-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="accelconfigpage|extended_tip|function">Select a 
function that you want to assign a shortcut key to, click a key combination in 
the Shortcut keys list, and then click Modify. If the selected function already 
has a shortcut key, it is displayed in the Keys list.</property>
+                          </object>
+                        </child>
                       </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>
+                <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="keys">
                         <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">liststore4</property>
+                        <property name="headers_visible">False</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="Macro Library 
List-selection4"/>
+                        </child>
                         <child>
-                          <object class="GtkTreeView" id="keys">
-                            <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">liststore4</property>
-                            <property name="headers_visible">False</property>
-                            <property name="search_column">0</property>
-                            <property name="show_expanders">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="Macro 
Library List-selection4"/>
-                            </child>
+                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn6">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
                             <child>
-                              <object class="GtkTreeViewColumn" 
id="treeviewcolumn6">
-                                <property name="resizable">True</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkCellRendererText" 
id="cellrenderer7"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
+                              <object class="GtkCellRendererText" 
id="cellrenderer7"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
                             </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
         </child>
diff --git a/cui/uiconfig/ui/acorexceptpage.ui 
b/cui/uiconfig/ui/acorexceptpage.ui
index 03de986e3f62..669a33eb0c34 100644
--- a/cui/uiconfig/ui/acorexceptpage.ui
+++ b/cui/uiconfig/ui/acorexceptpage.ui
@@ -35,175 +35,167 @@
         <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="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <property name="margin-top">6</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkGrid" id="grid1">
+              <object class="GtkEntry" id="abbrev">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="activates-default">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="abbrev-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|extended_tip|abbrev">Type an 
abbreviation followed by a period, and then click New. This prevents 
%PRODUCTNAME from automatically capitalizing the first letter of the word that 
comes after the period at the end of the abbreviation.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="autoabbrev">
+                <property name="label" translatable="yes" 
context="acorexceptpage|autoabbrev">_AutoInclude</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="autoabbrev-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" 
context="acorexceptpage|extended_tip|autoabbrev">Automatically adds 
abbreviations or words that start with two capital letters to the corresponding 
list of exceptions. This feature only works if the Correct TWo INitial CApitals 
option or the Capitalize first letter of every sentence option are selected in 
the [T] column onOptions tab of this dialog.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButtonBox" id="buttonbox1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <property name="layout_style">start</property>
                 <child>
-                  <object class="GtkEntry" id="abbrev">
+                  <object class="GtkButton" id="newabbrev">
+                    <property name="label">gtk-new</property>
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="activates-default">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_stock">True</property>
                     <child internal-child="accessible">
-                      <object class="AtkObject" id="abbrev-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|extended_tip|abbrev">Type an 
abbreviation followed by a period, and then click New. This prevents 
%PRODUCTNAME from automatically capitalizing the first letter of the word that 
comes after the period at the end of the abbreviation.</property>
+                      <object class="AtkObject" id="newabbrev-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|newabbrev-atkobject">New 
abbreviations</property>
                       </object>
                     </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">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="autoabbrev">
-                    <property name="label" translatable="yes" 
context="acorexceptpage|autoabbrev">_AutoInclude</property>
-                    <property name="visible">True</property>
+                  <object class="GtkButton" id="replace">
+                    <property name="label" translatable="yes" 
context="acorexceptpage|replace">_Replace</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
+                    <property name="receives_default">True</property>
+                    <property name="no_show_all">True</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="autoabbrev-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" 
context="acorexceptpage|extended_tip|autoabbrev">Automatically adds 
abbreviations or words that start with two capital letters to the corresponding 
list of exceptions. This feature only works if the Correct TWo INitial CApitals 
option or the Capitalize first letter of every sentence option are selected in 
the [T] column onOptions tab of this dialog.</property>
-                      </object>
-                    </child>
+                    <property name="image_position">right</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButtonBox" id="buttonbox1">
+                  <object class="GtkButton" id="delabbrev">
+                    <property name="label">gtk-delete</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
                     <property name="valign">start</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <property name="layout_style">start</property>
-                    <child>
-                      <object class="GtkButton" id="newabbrev">
-                        <property name="label">gtk-new</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="newabbrev-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|newabbrev-atkobject">New 
abbreviations</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="replace">
-                        <property name="label" translatable="yes" 
context="acorexceptpage|replace">_Replace</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="no_show_all">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="image_position">right</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="delabbrev">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="valign">start</property>
-                        <property name="use_stock">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="delabbrev-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|delabbrev-atkobject">Delete 
abbreviations</property>
-                          </object>
-                        </child>
+                    <property name="use_stock">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="delabbrev-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|delabbrev-atkobject">Delete 
abbreviations</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">1</property>
+                    <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">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="abbrevlist">
                     <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">liststore2</property>
+                    <property name="headers_visible">False</property>
+                    <property name="search_column">0</property>
+                    <property name="show_expanders">False</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="Macro Library 
List-selection2"/>
+                    </child>
                     <child>
-                      <object class="GtkTreeView" id="abbrevlist">
-                        <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">liststore2</property>
-                        <property name="headers_visible">False</property>
-                        <property name="search_column">0</property>
-                        <property name="show_expanders">False</property>
-                        <child internal-child="selection">
-                          <object class="GtkTreeSelection" id="Macro Library 
List-selection2"/>
-                        </child>
+                      <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+                        <property name="resizable">True</property>
+                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn2">
-                            <property name="resizable">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderer2"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="abbrevlist-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|extended_tip|abbrevlist">Lists the 
abbreviations that are not automatically corrected.</property>
-                          </object>
+                          <object class="GtkCellRendererText" 
id="cellrenderer2"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
                         </child>
                       </object>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="abbrevlist-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|extended_tip|abbrevlist">Lists the 
abbreviations that are not automatically corrected.</property>
+                      </object>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
             </child>
           </object>
         </child>
@@ -233,176 +225,168 @@
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
-          <object class="GtkAlignment" id="alignment2">
+          <!-- n-columns=1 n-rows=1 -->
+          <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
-            <property name="top_padding">6</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <property name="margin-top">6</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkGrid" id="grid2">
+              <object class="GtkEntry" id="double">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can_focus">True</property>
+                <property name="valign">start</property>
                 <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">12</property>
+                <property name="activates-default">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="double-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|extended_tip|double">Type the word 
or abbreviation that starts with two capital letters that you do not want 
%PRODUCTNAME to change to one initial capital. For example, enter PC to prevent 
%PRODUCTNAME from changing PC to Pc.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="autodouble">
+                <property name="label" translatable="yes" 
context="acorexceptpage|autodouble">A_utoInclude</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="autodouble-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" 
context="acorexceptpage|extended_tip|autodouble">Automatically adds 
abbreviations or words that start with two capital letters to the corresponding 
list of exceptions. This feature only works if the Correct TWo INitial CApitals 
option or the Capitalize first letter of every sentence option are selected in 
the [T] column onOptions tab of this dialog.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButtonBox" id="buttonbox2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
+                <property name="layout_style">start</property>
                 <child>
-                  <object class="GtkEntry" id="double">
+                  <object class="GtkButton" id="newdouble">
+                    <property name="label">gtk-new</property>
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
-                    <property name="valign">start</property>
-                    <property name="hexpand">True</property>
-                    <property name="activates-default">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_stock">True</property>
                     <child internal-child="accessible">
-                      <object class="AtkObject" id="double-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|extended_tip|double">Type the word 
or abbreviation that starts with two capital letters that you do not want 
%PRODUCTNAME to change to one initial capital. For example, enter PC to prevent 
%PRODUCTNAME from changing PC to Pc.</property>
+                      <object class="AtkObject" id="newdouble-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|newdouble-atkobject">New words with 
two initial capitals or small initial</property>
                       </object>
                     </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">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="autodouble">
-                    <property name="label" translatable="yes" 
context="acorexceptpage|autodouble">A_utoInclude</property>
-                    <property name="visible">True</property>
+                  <object class="GtkButton" id="replace1">
+                    <property name="label" translatable="yes" 
context="acorexceptpage|replace1">_Replace</property>
                     <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
+                    <property name="receives_default">True</property>
+                    <property name="no_show_all">True</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="autodouble-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" 
context="acorexceptpage|extended_tip|autodouble">Automatically adds 
abbreviations or words that start with two capital letters to the corresponding 
list of exceptions. This feature only works if the Correct TWo INitial CApitals 
option or the Capitalize first letter of every sentence option are selected in 
the [T] column onOptions tab of this dialog.</property>
-                      </object>
-                    </child>
+                    <property name="image_position">right</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButtonBox" id="buttonbox2">
+                  <object class="GtkButton" id="deldouble">
+                    <property name="label">gtk-delete</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
                     <property name="valign">start</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <property name="layout_style">start</property>
-                    <child>
-                      <object class="GtkButton" id="newdouble">
-                        <property name="label">gtk-new</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="newdouble-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|newdouble-atkobject">New words with 
two initial capitals or small initial</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="replace1">
-                        <property name="label" translatable="yes" 
context="acorexceptpage|replace1">_Replace</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="no_show_all">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="image_position">right</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="deldouble">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="valign">start</property>
-                        <property name="use_stock">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="deldouble-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|deldouble-atkobject">Delete words 
with two initial capitals or small initial</property>
-                          </object>
-                        </child>
+                    <property name="use_stock">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="deldouble-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|deldouble-atkobject">Delete words 
with two initial capitals or small initial</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">1</property>
+                    <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">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="doublelist">
                     <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="headers_visible">False</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="doublelist">
-                        <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="headers_visible">False</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>
                         <child>
-                          <object class="GtkTreeViewColumn" 
id="treeviewcolumn1">
-                            <property name="resizable">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkCellRendererText" 
id="cellrenderer1"/>
-                              <attributes>
-                                <attribute name="text">0</attribute>
-                              </attributes>
-                            </child>
-                          </object>
-                        </child>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="doublelist-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|extended_tip|doublelist">Lists the 
words or abbreviations that start with two initial capitals that are not 
automatically corrected. All words which start with two capital letters are 
listed in the field.</property>
-                          </object>
+                          <object class="GtkCellRendererText" 
id="cellrenderer1"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
                         </child>
                       </object>
                     </child>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="doublelist-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="acorexceptpage|extended_tip|doublelist">Lists the 
words or abbreviations that start with two initial capitals that are not 
automatically corrected. All words which start with two capital letters are 
listed in the field.</property>
+                      </object>
+                    </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
             </child>
           </object>
         </child>
diff --git a/cui/uiconfig/ui/agingdialog.ui b/cui/uiconfig/ui/agingdialog.ui
index 952b0a719fcb..1b4e1d0f661d 100644
--- a/cui/uiconfig/ui/agingdialog.ui
+++ b/cui/uiconfig/ui/agingdialog.ui
@@ -89,86 +89,74 @@
             <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="column_spacing">24</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="GtkScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
-                    <property name="column_spacing">24</property>
+                    <property name="hscrollbar_policy">never</property>
+                    <property name="vscrollbar_policy">never</property>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkScrolledWindow">
+                      <object class="GtkViewport">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="vscrollbar_policy">never</property>
-                        <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkViewport">
+                          <object class="GtkDrawingArea" id="preview">
                             <property name="visible">True</property>
                             <property name="can_focus">False</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>
-                              </object>
-                            </child>
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <!-- n-columns=1 n-rows=1 -->
+                  <object class="GtkGrid" id="grid2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <child>
+                      <object class="GtkSpinButton" id="value">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">adjustment1</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="value-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="agingdialog|extended_tip|value">Specifies the 
number of colors to which the image is to be reduced.</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
                       </packing>
                     </child>
                     <child>
-                      <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid2">
+                      <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkSpinButton" id="value">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment1</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="value-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="agingdialog|extended_tip|value">Specifies the number of colors to 
which the image is to be reduced.</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" 
context="agingdialog|label2">Aging degree:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">value</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
+                        <property name="label" translatable="yes" 
context="agingdialog|label2">Aging degree:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">value</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -176,6 +164,10 @@
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
                 </child>
               </object>
             </child>
diff --git a/cui/uiconfig/ui/applylocalizedpage.ui 
b/cui/uiconfig/ui/applylocalizedpage.ui
index 170b285e1ae9..9877f7c7f5f1 100644
--- a/cui/uiconfig/ui/applylocalizedpage.ui
+++ b/cui/uiconfig/ui/applylocalizedpage.ui
@@ -229,176 +229,170 @@
                 <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="grid4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</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>
+                    <child>
+                      <object class="GtkCheckButton" id="singlereplace">
+                        <property name="label" translatable="yes" 
context="applylocalizedpage|singlereplace">Repla_ce</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="singlereplace-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" 
context="applylocalizedpage|extended_tip|singlereplace">Automatically replaces 
the default system symbol for the given type of quotation marks with the 
special character that you specify.</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="startquoteft">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin-start">12</property>
+                        <property name="label" translatable="yes" 
context="applylocalizedpage|startquoteft">_Start quote:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">startsingle</property>
+                        <property name="xalign">0</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
                     <child>
                       <!-- n-columns=1 n-rows=1 -->
-                      <object class="GtkGrid" id="grid4">
+                      <object class="GtkGrid" id="grid5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkCheckButton" id="singlereplace">
-                            <property name="label" translatable="yes" 
context="applylocalizedpage|singlereplace">Repla_ce</property>
+                          <object class="GtkButton" id="startsingle">
+                            <property name="label"> ' </property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="receives_default">True</property>
                             <child internal-child="accessible">
-                              <object class="AtkObject" 
id="singlereplace-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="applylocalizedpage|extended_tip|singlereplace">Automatically replaces 
the default system symbol for the given type of quotation marks with the 
special character that you specify.</property>
+                              <object class="AtkObject" 
id="startsingle-atkobject">
+                                <property name="AtkObject::accessible-name" 
translatable="yes" context="applylocalizedpage|startsingle-atkobject">Start 
quote of single quotes</property>
+                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="applylocalizedpage|extended_tip|startsingle">Select the special 
character that will automatically replace the current opening quotation mark in 
your document when you choose Tools - AutoCorrect - Apply.</property>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="startquoteft">
+                          <object class="GtkLabel" id="singlestartex">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="margin-start">12</property>
-                            <property name="label" translatable="yes" 
context="applylocalizedpage|startquoteft">_Start quote:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">startsingle</property>
+                            <property name="label" translatable="yes" 
context="applylocalizedpage|singlestartex">Default</property>
                             <property name="xalign">0</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
-                        <child>
-                          <!-- n-columns=1 n-rows=1 -->
-                          <object class="GtkGrid" id="grid5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="column_spacing">12</property>
-                            <child>
-                              <object class="GtkButton" id="startsingle">
-                                <property name="label"> ' </property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">True</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" 
id="startsingle-atkobject">
-                                    <property 
name="AtkObject::accessible-name" translatable="yes" 
context="applylocalizedpage|startsingle-atkobject">Start quote of single 
quotes</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