[Libreoffice-commits] core.git: svx/source svx/uiconfig

[Pranam Lashkari (via logerrit)]

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |    2 +-
 svx/uiconfig/ui/sidebararea.ui                    |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9ed61699760544b780bd3eb5820d92233cd5fb4d
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Wed Apr 22 16:59:11 2020 +0530
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Apr 23 13:18:09 2020 +0200

    resolved: Impress mobile Choosing a different type of shape fill crashes
    
    Change-Id: Idd8dbba866b64089055880ffad9b5cbd9b12ca85
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92688
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 270b29be96a2..4a09525fa158 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -74,7 +74,7 @@ AreaPropertyPanelBase::AreaPropertyPanelBase(
       maGradientSquare(),
       maGradientRect(),
       mxColorTextFT(m_xBuilder->weld_label("filllabel")),
-      mxLbFillType(m_xBuilder->weld_combo_box("fillstyle")),
+      mxLbFillType(m_xBuilder->weld_combo_box("fillstylearea")),
       mxLbFillAttr(m_xBuilder->weld_combo_box("fillattr")),
       mxLbFillGradFrom(new ColorListBox(m_xBuilder->weld_menu_button("fillgrad1"), GetFrameWeld())),
       mxLbFillGradTo(new ColorListBox(m_xBuilder->weld_menu_button("fillgrad2"), GetFrameWeld())),
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 91e81ab60482..18728d255743 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -101,13 +101,13 @@
           </packing>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="fillstyle">
+          <object class="GtkComboBoxText" id="fillstylearea">
             <property name="visible">True</property>
             <property name="can_focus">False</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>
             <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>