[Libreoffice-commits] core.git: cui/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 cui/uiconfig/ui/paragalignpage.ui      |    6 ++++--
 cui/uiconfig/ui/paraindentspacing.ui   |   11 +++++------
 sw/uiconfig/swriter/ui/dropcapspage.ui |    6 ++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit ba156df0c103fde35c9750e321f091d81df0a4a6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Sep 15 16:26:56 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 18 12:36:54 2018 +0200

    make preview position align again
    
    Change-Id: I8e14cb855c5588c161d87d421c8e2870a165d4cb
    Reviewed-on: https://gerrit.libreoffice.org/60531
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui
index 6f0cf827b4b3..e29347ca0ede 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -14,8 +14,6 @@
       <object class="GtkAlignment" id="alignment4">
         <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">24</property>
         <child>
           <object class="GtkScrolledWindow">
@@ -57,6 +55,10 @@
       <object class="GtkGrid" id="maingrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="valign">start</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <property name="row_spacing">12</property>
         <child>
           <object class="GtkFrame" id="frame1">
diff --git a/cui/uiconfig/ui/paraindentspacing.ui b/cui/uiconfig/ui/paraindentspacing.ui
index 318bfa853d99..c5977b219aa3 100644
--- a/cui/uiconfig/ui/paraindentspacing.ui
+++ b/cui/uiconfig/ui/paraindentspacing.ui
@@ -2,7 +2,6 @@
 <!-- Generated with glade 3.22.1 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentED_DIST">
     <property name="upper">9999</property>
     <property name="step_increment">1</property>
@@ -52,13 +51,11 @@
       <object class="GtkAlignment" id="alignment5">
         <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">24</property>
         <child>
           <object class="GtkScrolledWindow">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="hscrollbar_policy">never</property>
@@ -74,8 +71,6 @@
                     <property name="can_focus">False</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="drawingareaWN_EXAMPLE-atkobject">
                         <property name="AtkObject::accessible-name" translatable="yes" context="paraindentspacing|drawingareaWN_EXAMPLE-atkobject">Example</property>
@@ -97,6 +92,10 @@
       <object class="GtkGrid" id="maingrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="valign">start</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <property name="row_spacing">12</property>
         <child>
           <object class="GtkFrame" id="frame1">
diff --git a/sw/uiconfig/swriter/ui/dropcapspage.ui b/sw/uiconfig/swriter/ui/dropcapspage.ui
index 5bfdcb11fd2f..fa1459652f60 100644
--- a/sw/uiconfig/swriter/ui/dropcapspage.ui
+++ b/sw/uiconfig/swriter/ui/dropcapspage.ui
@@ -31,6 +31,10 @@
       <object class="GtkGrid" id="maingrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="valign">start</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <property name="row_spacing">12</property>
         <child>
           <object class="GtkFrame" id="frame1">
@@ -282,8 +286,6 @@
       <object class="GtkAlignment" id="alignment3">
         <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">24</property>
         <child>
           <object class="GtkScrolledWindow">