solenv/sanitizers/ui/svx.suppr | 4 ++--
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 4 ++--
svx/uiconfig/ui/sidebararea.ui | 20 ++++++++++----------
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 12403a79bef7a41a88ca8142a2efce66b3c7fe7c
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Mon Apr 27 17:15:02 2020 +0530
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat May 23 17:00:43 2020 +0100
resolved clashing of two ids
Multiple SvxFillAttrBox objects having the same ID 'fillattr' caused
the problem in online making it hard to distinguish for different function
Change-Id: Ic5a29ea75fb442d7e495761faf4a10d6ab212829
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92976
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 976c2cff2b9c..5b9e46a74810 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -61,7 +61,7 @@ svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label1']
orphan-label
svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label3'] orphan-label
svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label4'] orphan-label
svx/uiconfig/ui/sidebararea.ui://GtkLabel[@id='filllabel'] orphan-label
-svx/uiconfig/ui/sidebararea.ui://svxlo-SvxFillAttrBox[@id='fillattr']
missing-label-for
+svx/uiconfig/ui/sidebararea.ui://svxlo-SvxFillAttrBox[@id='fillattrhb']
missing-label-for
svx/uiconfig/ui/sidebararea.ui://svxlo-SvxFillTypeBox[@id='fillstylearea']
missing-label-for
svx/uiconfig/ui/sidebararea.ui://GtkLabel[@id='transparencylabel'] orphan-label
svx/uiconfig/ui/sidebarshadow.ui://GtkLabel[@id='angle'] orphan-label
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 257442687df0..8cfc9c6d2459 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -93,7 +93,7 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
{
get(mpColorTextFT, "filllabel");
get(mpLbFillType, "fillstylearea");
- get(mpLbFillAttr, "fillattr");
+ get(mpLbFillAttr, "fillattrhb");
get(mpTrspTextFT, "transparencylabel");
get(mpToolBoxColor, "selectcolor");
get(mpLBTransType, "transtype");
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 68a58b46a872..a6b13886fdbd 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -80,16 +80,16 @@
</packing>
</child>
<child>
- <object class="svxlo-SvxFillAttrBox" id="fillattr">
+ <object class="svxlo-SvxFillAttrBox" id="fillattrhb">
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebararea|fillattr|tooltip_text">Select the effect to
apply.</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebararea|fillattrhb|tooltip_text">Select the effect to
apply.</property>
<accessibility>
<relation type="labelled-by" target="filllabel"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="fillattr-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebararea|fillattr-atkobject">Hatching/Bitmap</property>
+ <object class="AtkObject" id="fillattrhb-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes"
context="sidebararea|fillattrhb-atkobject">Hatching/Bitmap</property>
</object>
</child>
</object>
@@ -372,7 +372,7 @@
<property name="mode">both</property>
<widgets>
<widget name="selectcolor"/>
- <widget name="fillattr"/>
+ <widget name="fillattrhb"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
commit 0bfde01ab34bb366bc3d1b34c3211dc74b66d266
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Wed Apr 22 16:48:35 2020 +0530
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Sat May 23 17:00:26 2020 +0100
resolved: Impress mobile Choosing a different type of shape fill crashes
Change-Id: Idd8dbba866b64089055880ffad9b5cbd9b12ca85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92687
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 5b323a5f23e8..976c2cff2b9c 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -62,7 +62,7 @@ svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label3']
orphan-label
svx/uiconfig/ui/safemodedialog.ui://GtkLabel[@id='label4'] orphan-label
svx/uiconfig/ui/sidebararea.ui://GtkLabel[@id='filllabel'] orphan-label
svx/uiconfig/ui/sidebararea.ui://svxlo-SvxFillAttrBox[@id='fillattr']
missing-label-for
-svx/uiconfig/ui/sidebararea.ui://svxlo-SvxFillTypeBox[@id='fillstyle']
missing-label-for
+svx/uiconfig/ui/sidebararea.ui://svxlo-SvxFillTypeBox[@id='fillstylearea']
missing-label-for
svx/uiconfig/ui/sidebararea.ui://GtkLabel[@id='transparencylabel'] orphan-label
svx/uiconfig/ui/sidebarshadow.ui://GtkLabel[@id='angle'] orphan-label
svx/uiconfig/ui/sidebarshadow.ui://GtkLabel[@id='distance'] orphan-label
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index a4388ce61232..257442687df0 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -92,7 +92,7 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
mpTransparanceItem()
{
get(mpColorTextFT, "filllabel");
- get(mpLbFillType, "fillstyle");
+ get(mpLbFillType, "fillstylearea");
get(mpLbFillAttr, "fillattr");
get(mpTrspTextFT, "transparencylabel");
get(mpToolBoxColor, "selectcolor");
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 73eaed5f58dd..68a58b46a872 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -120,19 +120,19 @@
</packing>
</child>
<child>
- <object class="svxlo-SvxFillTypeBox" id="fillstyle">
+ <object class="svxlo-SvxFillTypeBox" id="fillstylearea">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes"
context="sidebararea|fillstyle|tooltip_text">Select the fill type to
apply.</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebararea|fillstylearea|tooltip_text">Select the fill type to
apply.</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<accessibility>
- <relation type="labelled-by" target="fillstyle"/>
+ <relation type="labelled-by" target="fillstylearea"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="fillstyle-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes" context="sidebararea|fillstyle-atkobject">Fill
Type</property>
+ <object class="AtkObject" id="fillstylearea-atkobject">
+ <property name="AtkObject::accessible-name"
translatable="yes" context="sidebararea|fillstylearea-atkobject">Fill
Type</property>
</object>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
