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 0f25a92f22a82d7d5a81210b85766a6d6809226d Author: Pranam Lashkari <[email protected]> AuthorDate: Wed Apr 22 16:48:35 2020 +0530 Commit: Szymon Kłos <[email protected]> CommitDate: Thu Apr 23 13:18:03 2020 +0200 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 <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr index e921178d5aa9..3ce297659416 100644 --- a/solenv/sanitizers/ui/svx.suppr +++ b/solenv/sanitizers/ui/svx.suppr @@ -125,7 +125,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 969cd2c18a01..c980da943cde 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 0c5b8b533cbf..560bced36ab2 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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
