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

[Mert Tumer (via logerrit)]

 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |    2 -
 sc/uiconfig/scalc/ui/sidebarnumberformat.ui        |   28 ++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 666bbf736381396647db69f97c753ffb8bddf693
Author:     Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Tue Apr 14 18:15:59 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Apr 17 11:13:05 2020 +0200

    Added unique id for number format combobox
    
    This will allow us to control it for the mobilewizard
    easily rather than using the id of 'category' which is
    not unique.
    
    Change-Id: I61b612d5355584597a16942b7151a82376033a45
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92202
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92309
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Jenkins

diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index ec9e665287b2..36dd8f129347 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -35,7 +35,7 @@ NumberFormatPropertyPanel::NumberFormatPropertyPanel(
     const css::uno::Reference<css::frame::XFrame>& rxFrame,
     SfxBindings* pBindings)
     : PanelLayout(pParent,"NumberFormatPropertyPanel", "modules/scalc/ui/sidebarnumberformat.ui", rxFrame, true)
-    , mxLbCategory(m_xBuilder->weld_combo_box("category"))
+    , mxLbCategory(m_xBuilder->weld_combo_box("numberformatcombobox"))
     , mxTBCategory(m_xBuilder->weld_toolbar("numberformat"))
     , mxCatagoryDispatch(new ToolbarUnoDispatcher(*mxTBCategory, *m_xBuilder, rxFrame))
     , mxFtDecimals(m_xBuilder->weld_label("decimalplaceslabel"))
diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
index 09704d6ef5d0..60a6185aac8f 100644
--- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
+++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui
@@ -67,27 +67,27 @@
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxText" id="category">
+              <object class="GtkComboBoxText" id="numberformatcombobox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|category|tooltip_text">Select a category of contents.</property>
+                <property name="tooltip_text" translatable="yes" context="sidebarnumberformat|numberformatcombobox|tooltip_text">Select a category of contents.</property>
                 <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <items>
-                  <item translatable="yes" context="sidebarnumberformat|category">General</item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Number</item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Percent</item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Currency</item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Date </item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Time</item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Scientific</item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Fraction</item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Boolean Value</item>
-                  <item translatable="yes" context="sidebarnumberformat|category">Text</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">General</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Number</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Percent</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Currency</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Date </item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Time</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Scientific</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Fraction</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Boolean Value</item>
+                  <item translatable="yes" context="sidebarnumberformat|numberformatcombobox">Text</item>
                 </items>
                 <child internal-child="accessible">
-                  <object class="AtkObject" id="category-atkobject">
-                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarnumberformat|category-atkobject">Category</property>
+                  <object class="AtkObject" id="numberformatcombobox-atkobject">
+                    <property name="AtkObject::accessible-name" translatable="yes" context="sidebarnumberformat|numberformatcombobox-atkobject">Category</property>
                   </object>
                 </child>
               </object>