[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sd/uiconfig

[Katarina Behrens (via logerrit)]

 sd/uiconfig/simpress/ui/sidebarslidebackground.ui |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 4956d637401e07e9d562233d963739ec16d0d929
Author:     Katarina Behrens <bubli at bubli.org>
AuthorDate: Tue May 4 10:06:26 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed May 5 12:19:47 2021 +0200

    tdf#139329: Shift widgets down and make hatch&bitmap list visible
    
    regression from commit cbe86ee37018dc4bf04783ecf70fef2863e61ad7
    which inserted additional gradient colour picker but didn't
    adjust the positions of widgets below accordingly so in effect
    there were 2 widgets at position y=4
    
    Sad that neither glade nor our own code detects this condition and
    e.g. asserts or warns this is the case
    
    Change-Id: I4c635eeb8b740765542631a5f0319bfe1a5d94d0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115056
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <bubli at bubli.org>
    (cherry picked from commit c46a231b987b92bd866b415d1a0ba0d3a26a2457)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115074
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index 11141c29f827..9f5cd9958174 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -116,7 +116,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">10</property>
+            <property name="top_attach">11</property>
           </packing>
         </child>
         <child>
@@ -127,7 +127,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">9</property>
           </packing>
         </child>
         <child>
@@ -139,7 +139,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
+            <property name="top_attach">9</property>
           </packing>
         </child>
         <child>
@@ -152,7 +152,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">7</property>
           </packing>
         </child>
         <child>
@@ -197,7 +197,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
+            <property name="top_attach">5</property>
           </packing>
         </child>
         <child>
@@ -216,7 +216,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">5</property>
+            <property name="top_attach">6</property>
           </packing>
         </child>
         <child>
@@ -232,7 +232,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">9</property>
+            <property name="top_attach">10</property>
           </packing>
         </child>
         <child>
@@ -294,7 +294,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">11</property>
+            <property name="top_attach">12</property>
           </packing>
         </child>
         <child>
@@ -304,7 +304,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">8</property>
           </packing>
         </child>
         <child>
@@ -318,7 +318,7 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
+            <property name="top_attach">8</property>
           </packing>
         </child>
         <child>
@@ -329,7 +329,7 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">12</property>
+            <property name="top_attach">13</property>
           </packing>
         </child>
         <child>