[Libreoffice-commits] core.git: cui/inc cui/source

[Muhammet Kara]

 cui/inc/strings.hrc                             |    2 +-
 cui/source/customize/CommandCategoryListBox.cxx |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit cdb9e338f1e410fe968df3193369a1b516c50c35
Author: Muhammet Kara <muhammet.kara at pardus.org.tr>
Date:   Tue Dec 5 10:36:05 2017 +0300

    tdf#114091: Customize dialog: Rename 'All categories' to 'All commands'
    
    And put a separator before the 'Macros' category.
    
    Change-Id: Ibcff6b6c6d3a4f72d5e06b519fe8245d9602ad3c
    Reviewed-on: https://gerrit.libreoffice.org/45843
    Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>
    Tested-by: Heiko Tietze <tietze.heiko at googlemail.com>

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 16db3c213f71..af4fbb388b57 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -88,7 +88,7 @@
 
 #define RID_SVXSTR_ERR_TEXTNOTFOUND                 NC_("RID_SVXSTR_ERR_TEXTNOTFOUND", "No alternatives found.")
 #define RID_SVXSTR_SELECT_FILE_IFRAME               NC_("RID_SVXSTR_SELECT_FILE_IFRAME", "Select File for Floating Frame")
-#define RID_SVXSTR_ALLFUNCTIONS                     NC_("RID_SVXSTR_ALLFUNCTIONS", "All categories")
+#define RID_SVXSTR_ALLFUNCTIONS                     NC_("RID_SVXSTR_ALLFUNCTIONS", "All commands")
 #define RID_SVXSTR_MACROS                           NC_("RID_SVXSTR_MACROS", "Macros")
 #define RID_SVXSTR_MYMACROS                         NC_("RID_SVXSTR_MYMACROS", "My Macros")
 #define RID_SVXSTR_PRODMACROS                       NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros")
diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index ae100bf0bc03..1c93de9bd7cf 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -132,7 +132,7 @@ void CommandCategoryListBox::Init(
         css::uno::Sequence< sal_Int16 > lGroups = xProvider->getSupportedCommandGroups();
 
         sal_Int32 nGroupsLength = lGroups.getLength();
-        sal_Int32 nEntryPos;
+        sal_Int32 nEntryPos = 0;
 
         if ( nGroupsLength > 0 )
         {
@@ -166,6 +166,10 @@ void CommandCategoryListBox::Init(
             SetEntryData( nEntryPos, m_aGroupInfo.back().get() );
         }
 
+        // Separate regular commands from styles and macros
+        if (nEntryPos)
+            SetSeparatorPos(nEntryPos);
+
         // Add macros category
         OUString sMacros( CuiResId(RID_SVXSTR_MACROS) );
         nEntryPos = InsertEntry( sMacros );