summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatarina Behrens <bubli@bubli.org>2021-05-04 10:06:26 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2021-05-05 23:45:30 +0200
commit231ce4e8058d4885ef3975dbbde556c47a6161fb (patch)
tree8776462b7fa6fba23cba2594843f20d6a00eb7de
parenttdf#137945: Revert "use more FastParser in ScXMLContentValidationContext" (diff)
downloadcore-231ce4e8058d4885ef3975dbbde556c47a6161fb.tar.gz
core-231ce4e8058d4885ef3975dbbde556c47a6161fb.zip
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@bubli.org> (cherry picked from commit c46a231b987b92bd866b415d1a0ba0d3a26a2457) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115074 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 4956d637401e07e9d562233d963739ec16d0d929) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115081 (cherry picked from commit 154811f493df51e4cf90598aec86d992340f0e11) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115084 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--sd/uiconfig/simpress/ui/sidebarslidebackground.ui22
1 files changed, 11 insertions, 11 deletions
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index 644c443fb966..1e8afd46dcbb 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -114,7 +114,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">10</property>
+ <property name="top_attach">11</property>
</packing>
</child>
<child>
@@ -125,7 +125,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">9</property>
</packing>
</child>
<child>
@@ -137,7 +137,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">9</property>
</packing>
</child>
<child>
@@ -150,7 +150,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">7</property>
</packing>
</child>
<child>
@@ -195,7 +195,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
</packing>
</child>
<child>
@@ -214,7 +214,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
@@ -230,7 +230,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">9</property>
+ <property name="top_attach">10</property>
</packing>
</child>
<child>
@@ -292,7 +292,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">11</property>
+ <property name="top_attach">12</property>
</packing>
</child>
<child>
@@ -302,7 +302,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">7</property>
+ <property name="top_attach">8</property>
</packing>
</child>
<child>
@@ -316,7 +316,7 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="top_attach">8</property>
</packing>
</child>
<child>
@@ -327,7 +327,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">12</property>
+ <property name="top_attach">13</property>
</packing>
</child>
<child>