solenv/sanitizers/ui/svx.suppr | 2 +-
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 2 +-
svx/uiconfig/ui/sidebararea.ui | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit edb5bcf34cf38a9267ec16b618949c1266cd215f
Author: Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Mon Apr 27 17:15:02 2020 +0530
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Apr 28 07:54:13 2020 +0200
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 3ce297659416..87f3769ab09c 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -124,7 +124,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 c980da943cde..e22455ee2c5e 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 560bced36ab2..d6309be52412 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>
@@ -373,7 +373,7 @@
<property name="mode">both</property>
<widgets>
<widget name="selectcolor"/>
- <widget name="fillattr"/>
+ <widget name="fillattrhb"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
