diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-08 07:57:36 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-08 10:14:21 +0100 |
| commit | 1ba76fa81eb64c56c31379f678345a6667c47aa5 (patch) | |
| tree | a9c219596681da2e8b1e5fec5a3ec01b68b99cc0 /sd | |
| parent | fc51789ad0eafc41460e67773d11609d366fc4b7 (diff) | |
Use OUStringLiteral
Change-Id: I76b83140222cfd7e313736936b2803997c43836d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/stlsheet.cxx | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 7e98f6474268..55e3c5ff2148 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -54,6 +54,7 @@ #include "ViewShellBase.hxx" #include <editeng/boxitem.hxx> +#include <cstddef> #include <memory> using ::osl::MutexGuard; @@ -624,44 +625,40 @@ void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) { static struct ApiNameMap { - const sal_Char* mpApiName; - sal_uInt32 mnApiNameLength; + OUStringLiteral mpApiName; sal_uInt32 mnHelpId; } - pApiNameMap[] = + const pApiNameMap[] = { - { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_PSEUDOSHEET_TITLE }, - { RTL_CONSTASCII_STRINGPARAM( "subtitle" ), HID_PSEUDOSHEET_SUBTITLE }, - { RTL_CONSTASCII_STRINGPARAM( "background" ), HID_PSEUDOSHEET_BACKGROUND }, - { RTL_CONSTASCII_STRINGPARAM( "backgroundobjects" ),HID_PSEUDOSHEET_BACKGROUNDOBJECTS }, - { RTL_CONSTASCII_STRINGPARAM( "notes" ), HID_PSEUDOSHEET_NOTES }, - { RTL_CONSTASCII_STRINGPARAM( "standard" ), HID_STANDARD_STYLESHEET_NAME }, - { RTL_CONSTASCII_STRINGPARAM( "objectwitharrow" ), HID_POOLSHEET_OBJWITHARROW }, - { RTL_CONSTASCII_STRINGPARAM( "objectwithshadow" ), HID_POOLSHEET_OBJWITHSHADOW }, - { RTL_CONSTASCII_STRINGPARAM( "objectwithoutfill" ),HID_POOLSHEET_OBJWITHOUTFILL }, - { RTL_CONSTASCII_STRINGPARAM( "text" ), HID_POOLSHEET_TEXT }, - { RTL_CONSTASCII_STRINGPARAM( "textbody" ), HID_POOLSHEET_TEXTBODY }, - { RTL_CONSTASCII_STRINGPARAM( "textbodyjustfied" ), HID_POOLSHEET_TEXTBODY_JUSTIFY }, - { RTL_CONSTASCII_STRINGPARAM( "textbodyindent" ), HID_POOLSHEET_TEXTBODY_INDENT }, - { RTL_CONSTASCII_STRINGPARAM( "title" ), HID_POOLSHEET_TITLE }, - { RTL_CONSTASCII_STRINGPARAM( "title1" ), HID_POOLSHEET_TITLE1 }, - { RTL_CONSTASCII_STRINGPARAM( "title2" ), HID_POOLSHEET_TITLE2 }, - { RTL_CONSTASCII_STRINGPARAM( "headline" ), HID_POOLSHEET_HEADLINE }, - { RTL_CONSTASCII_STRINGPARAM( "headline1" ), HID_POOLSHEET_HEADLINE1 }, - { RTL_CONSTASCII_STRINGPARAM( "headline2" ), HID_POOLSHEET_HEADLINE2 }, - { RTL_CONSTASCII_STRINGPARAM( "measure" ), HID_POOLSHEET_MEASURE }, - { nullptr, 0, 0 } + { "title", HID_PSEUDOSHEET_TITLE }, + { "subtitle", HID_PSEUDOSHEET_SUBTITLE }, + { "background", HID_PSEUDOSHEET_BACKGROUND }, + { "backgroundobjects",HID_PSEUDOSHEET_BACKGROUNDOBJECTS }, + { "notes", HID_PSEUDOSHEET_NOTES }, + { "standard", HID_STANDARD_STYLESHEET_NAME }, + { "objectwitharrow", HID_POOLSHEET_OBJWITHARROW }, + { "objectwithshadow", HID_POOLSHEET_OBJWITHSHADOW }, + { "objectwithoutfill",HID_POOLSHEET_OBJWITHOUTFILL }, + { "text", HID_POOLSHEET_TEXT }, + { "textbody", HID_POOLSHEET_TEXTBODY }, + { "textbodyjustfied", HID_POOLSHEET_TEXTBODY_JUSTIFY }, + { "textbodyindent", HID_POOLSHEET_TEXTBODY_INDENT }, + { "title", HID_POOLSHEET_TITLE }, + { "title1", HID_POOLSHEET_TITLE1 }, + { "title2", HID_POOLSHEET_TITLE2 }, + { "headline", HID_POOLSHEET_HEADLINE }, + { "headline1", HID_POOLSHEET_HEADLINE1 }, + { "headline2", HID_POOLSHEET_HEADLINE2 }, + { "measure", HID_POOLSHEET_MEASURE } }; - ApiNameMap* p = pApiNameMap; - while( p->mpApiName ) + for (std::size_t i = 0; i != SAL_N_ELEMENTS(pApiNameMap); ++i) { - if( nId == p->mnHelpId ) + if( nId == pApiNameMap[i].mnHelpId ) { - msApiName = OUString( p->mpApiName, p->mnApiNameLength, RTL_TEXTENCODING_ASCII_US ); + msApiName = pApiNameMap[i].mpApiName; break; } - p++; } } } |