Resolves tdf#145821 - Layout inconsistency on paragrapgh dialog

This reverts expanded controls from patch Icb22f2a9f24852898ab4550bc0cec32732ad32dd

Change-Id: Iac9a0d920193d47976d6a2fc9305c43b09447019
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125642
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

1 files changed, 93 insertions, 85 deletions

diff --git a/sw/uiconfig/swriter/ui/numparapage.ui b/sw/uiconfig/swriter/ui/numparapage.ui
index b2a5ea27ce1d..bc815a04826b 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustmentNF_RESTART_PARA">
     <property name="lower">1</property>
     <property name="upper">65000</property>
     <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustmentSTART_WITH">
     <property name="upper">9999</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkBox" id="NumParaPage">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">6</property>
     <child>
       <object class="GtkFrame" id="frameFL_OUTLINE_START">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="can-focus">False</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkBox" id="boxOUTLINE">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkLabel" id="labelFT_OUTLINE_LEVEL">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
+                <property name="tooltip-text" translatable="yes" context="numparapage|labelFT_OUTLINE_LEVEL">Select or change the Outline Level applied to the selected paragraphs or Paragraph Style.</property>
                 <property name="label" translatable="yes" context="numparapage|labelFT_OUTLINE_LEVEL">Outline level:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">comboLB_OUTLINE_LEVEL</property>
+                <property name="use-underline">True</property>
+                <property name="mnemonic-widget">comboLB_OUTLINE_LEVEL</property>
                 <property name="xalign">0</property>
-                <property name="tooltip_text" translatable="yes" context="numparapage|labelFT_OUTLINE_LEVEL">Select or change the Outline Level applied to the selected paragraphs or Paragraph Style.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -52,8 +53,8 @@
             <child>
               <object class="GtkComboBoxText" id="comboLB_OUTLINE_LEVEL">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Assigned Outline Level</property>
+                <property name="can-focus">False</property>
+                <property name="tooltip-text" translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Assigned Outline Level</property>
                 <items>
                   <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Text Body</item>
                   <item translatable="yes" context="numparapage|comboLB_OUTLINE_LEVEL">Level 1</item>
@@ -75,7 +76,7 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -84,7 +85,7 @@
         <child type="label">
           <object class="GtkLabel" id="labelOutline">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="numparapage|labelOutline">Outline</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -101,30 +102,31 @@
     <child>
       <object class="GtkFrame" id="frameFL_NEW_START">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="can-focus">False</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">none</property>
         <child>
           <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>
+            <property name="can-focus">False</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="boxNUMBER_STYLE">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
+                <property name="halign">start</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="labelFT_NUMBER_STYLE">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" context="numparapage|labelFT_NUMBER_STYLE">Select a List Style to apply to the paragraph.</property>
                     <property name="label" translatable="yes" context="numparapage|labelFT_NUMBER_STYLE">_List style:</property>
-                    <property name="tooltip_text" translatable="yes" context="numparapage|labelFT_NUMBER_STYLE">Select a List Style to apply to the paragraph.</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">comboLB_NUMBER_STYLE</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">comboLB_NUMBER_STYLE</property>
                     <property name="xalign">0</property>
                   </object>
                   <packing>
@@ -136,13 +138,13 @@
                 <child>
                   <object class="GtkBox" id="boxSubNumber_Style">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkComboBoxText" id="comboLB_NUMBER_STYLE">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">Assigned List Style</property>
+                        <property name="can-focus">False</property>
+                        <property name="tooltip-text" translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">Assigned List Style</property>
                         <items>
                           <item translatable="yes" context="numparapage|comboLB_NUMBER_STYLE">No List</item>
                         </items>
@@ -162,8 +164,8 @@
                       <object class="GtkButton" id="editnumstyle">
                         <property name="label" translatable="yes" context="numparapage|editnumstyle">Edit Style</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="editnumstyle-atkobject">
                             <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|editnumstyle">Edit the properties of the selected List Style.</property>
@@ -179,28 +181,29 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkCheckButton" id="checkCB_NEW_START">
                 <property name="label" translatable="yes" context="numparapage|checkCB_NEW_START">R_estart numbering at this paragraph</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes" context="numparapage|checkCB_NEW_START">For ordered lists and List Styles with numbering</property>
-                <property name="no_show_all">True</property>
-                <property name="hexpand">True</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="no-show-all">True</property>
+                <property name="tooltip-text" translatable="yes" context="numparapage|checkCB_NEW_START">For ordered lists and List Styles with numbering</property>
+                <property name="halign">start</property>
+                <property name="use-underline">True</property>
+                <property name="xalign">0</property>
                 <property name="inconsistent">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="draw-indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="checkCB_NEW_START-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_NEW_START">Restarts the numbering at the current paragraph.</property>
@@ -209,29 +212,31 @@
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="boxNEW_START">
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
+                <property name="halign">start</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkBox" id="box4">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">start</property>
                     <child>
                       <object class="GtkCheckButton" id="checkCB_NUMBER_NEW_START">
                         <property name="label" translatable="yes" context="numparapage|checkCB_NUMBER_NEW_START">S_tart with:</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
+                        <property name="can-focus">True</property>
+                        <property name="receives-default">False</property>
+                        <property name="halign">start</property>
                         <property name="margin-start">12</property>
-                        <property name="use_underline">True</property>
+                        <property name="use-underline">True</property>
                         <property name="inconsistent">True</property>
-                        <property name="draw_indicator">True</property>
+                        <property name="draw-indicator">True</property>
                         <accessibility>
                           <relation type="label-for" target="spinNF_NEW_START"/>
                         </accessibility>
@@ -242,25 +247,25 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkSpinButton" id="spinNF_NEW_START">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="adjustment">adjustmentSTART_WITH</property>
+                    <property name="can-focus">True</property>
+                    <property name="activates-default">True</property>
                     <property name="truncate-multiline">True</property>
+                    <property name="adjustment">adjustmentSTART_WITH</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="spinNF_NEW_START-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|spinNF_NEW_START">Enter the number that you want to assign to the paragraph.</property>
@@ -285,7 +290,7 @@
         <child type="label">
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="numparapage|label2">Apply List Style</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -302,27 +307,28 @@
     <child>
       <object class="GtkFrame" id="frameFL_COUNT_PARA">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="can-focus">False</property>
+        <property name="label-xalign">0</property>
+        <property name="shadow-type">none</property>
         <child>
           <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="can-focus">False</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkCheckButton" id="checkCB_COUNT_PARA">
                 <property name="label" translatable="yes" context="numparapage|checkCB_COUNT_PARA">_Include this paragraph in line numbering</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="hexpand">True</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="halign">start</property>
+                <property name="use-underline">True</property>
+                <property name="xalign">0</property>
                 <property name="inconsistent">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="draw-indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="checkCB_COUNT_PARA-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_COUNT_PARA">Includes the current paragraph in the line numbering.</property>
@@ -339,12 +345,13 @@
               <object class="GtkCheckButton" id="checkCB_RESTART_PARACOUNT">
                 <property name="label" translatable="yes" context="numparapage|checkCB_RESTART_PARACOUNT">Rest_art at this paragraph</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="hexpand">True</property>
-                <property name="use_underline">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="halign">start</property>
+                <property name="use-underline">True</property>
+                <property name="xalign">0</property>
                 <property name="inconsistent">True</property>
-                <property name="draw_indicator">True</property>
+                <property name="draw-indicator">True</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="checkCB_RESTART_PARACOUNT-atkobject">
                     <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|checkCB_RESTART_PARACOUNT">Restarts the line numbering at the current paragraph, or at the number that you enter.</property>
@@ -361,22 +368,23 @@
               <object class="GtkBox" id="boxRESTART_NO">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
+                <property name="halign">start</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="labelFT_RESTART_NO">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="halign">start</property>
                         <property name="margin-start">12</property>
                         <property name="label" translatable="yes" context="numparapage|labelFT_RESTART_NO">_Start with:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">spinNF_RESTART_PARA</property>
+                        <property name="use-underline">True</property>
+                        <property name="mnemonic-widget">spinNF_RESTART_PARA</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -395,10 +403,10 @@
                 <child>
                   <object class="GtkSpinButton" id="spinNF_RESTART_PARA">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="activates_default">True</property>
-                    <property name="adjustment">adjustmentNF_RESTART_PARA</property>
+                    <property name="can-focus">True</property>
+                    <property name="activates-default">True</property>
                     <property name="truncate-multiline">True</property>
+                    <property name="adjustment">adjustmentNF_RESTART_PARA</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="spinNF_RESTART_PARA-atkobject">
                         <property name="AtkObject::accessible-description" translatable="yes" context="numparapage|extended_tip|spinNF_RESTART_PARA">Enter the number at which to restart the line numbering</property>
@@ -423,7 +431,7 @@
         <child type="label">
           <object class="GtkLabel" id="labelLINE_NUMBERING">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="numparapage|labelLINE_NUMBERING">Line Numbering</property>
             <attributes>
               <attribute name="weight" value="bold"/>