summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammet Kara <muhammet.kara@pardus.org.tr>2017-12-05 10:36:05 +0300
committerMuhammet Kara <muhammet.kara@pardus.org.tr>2017-12-05 14:23:26 +0100
commit36413dbca6cb6f8350bb92c5609759a26f7d9ab7 (patch)
tree80b2840f1b2e4a7bd5e3acb045eabc7de77171d8
parent85caee08ae6fa32f9db8be206bf3ca11bc3949b8 (diff)
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@googlemail.com> Tested-by: Heiko Tietze <tietze.heiko@googlemail.com> (cherry picked from commit cdb9e338f1e410fe968df3193369a1b516c50c35) Reviewed-on: https://gerrit.libreoffice.org/45872 Tested-by: Jenkins <ci@libreoffice.org>
-rw-r--r--cui/inc/strings.hrc2
-rw-r--r--cui/source/customize/CommandCategoryListBox.cxx6
2 files changed, 6 insertions, 2 deletions
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 27dd89ba48d1..539c1b9bc9ba 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 );