diff options
| author | Pranam Lashkari <lpranam@collabora.com> | 2020-04-22 16:48:35 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-05-23 17:00:26 +0100 |
| commit | 0bfde01ab34bb366bc3d1b34c3211dc74b66d266 (patch) | |
| tree | 4223b7b0cb63ffd5b4c7943c33ecab783d771f9d | |
| parent | b2def0d79a38b6d050ab1016e1be1b873a1a5a6e (diff) | |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
| -rw-r--r-- | solenv/sanitizers/ui/svx.suppr | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 2 | ||||
| -rw-r--r-- | svx/uiconfig/ui/sidebararea.ui | 10 |
3 files changed, 7 insertions, 7 deletions
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> |