svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 2 +- svx/uiconfig/ui/sidebararea.ui | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit f94caa1ad48a0aad061cf3aa41ba45c5348ecfe4 Author: Pranam Lashkari <lpra...@collabora.com> AuthorDate: Mon Apr 27 18:17:44 2020 +0530 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Tue Apr 28 07:57:34 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/+/92977 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.ti...@collabora.com> diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index c51ae522792c..76eb6c29e845 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -75,7 +75,7 @@ AreaPropertyPanelBase::AreaPropertyPanelBase( maGradientRect(), mxColorTextFT(m_xBuilder->weld_label("filllabel")), mxLbFillType(m_xBuilder->weld_combo_box("fillstylearea")), - mxLbFillAttr(m_xBuilder->weld_combo_box("fillattr")), + mxLbFillAttr(m_xBuilder->weld_combo_box("fillattrhb")), mxLbFillGradFrom(new ColorListBox(m_xBuilder->weld_menu_button("fillgrad1"), GetFrameWeld())), mxLbFillGradTo(new ColorListBox(m_xBuilder->weld_menu_button("fillgrad2"), GetFrameWeld())), mxToolBoxColor(m_xBuilder->weld_toolbar("selectcolor")), diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui index 18728d255743..feae68d20fa1 100644 --- a/svx/uiconfig/ui/sidebararea.ui +++ b/svx/uiconfig/ui/sidebararea.ui @@ -198,10 +198,10 @@ </packing> </child> <child> - <object class="GtkComboBox" id="fillattr"> + <object class="GtkComboBox" id="fillattrhb"> <property name="visible">True</property> <property name="can_focus">False</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> <property name="hexpand">True</property> <property name="model">liststore4</property> <property name="entry_text_column">0</property> @@ -219,8 +219,8 @@ </attributes> </child> <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> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits