diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 21:14:00 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-19 15:40:40 +0200 |
commit | 2155e04d6343638ca9815d394cbc4f78c2b17c3a (patch) | |
tree | 0378142f6ce9edb63074291aed45527568e7b254 /sw/source/uibase/app/swmodule.cxx | |
parent | cee02e81cd3b55fb46eacf5db5713e8bf4363bcd (diff) |
make string translation loading more uniform
change various ResId classes that use conversion operator to OUString to
functions that return a OUString
drop various defines
drop unnecessary toString calls
Change-Id: Ibeccdf2b91a46a2ed5b4b74e6024e301a023bc92
Reviewed-on: https://gerrit.libreoffice.org/37817
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase/app/swmodule.cxx')
-rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 0b7734ac5f7a..9296b29096df 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -403,34 +403,34 @@ SfxStyleFamilies* SwModule::CreateStyleFamilies() SfxStyleFamilies *pStyleFamilies = new SfxStyleFamilies; pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Para, - SW_RESSTR(STR_PARAGRAPHSTYLEFAMILY), + SwResId(STR_PARAGRAPHSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_PARA)), - SW_RES(RID_PARAGRAPHSTYLEFAMILY))); + ResId(RID_PARAGRAPHSTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Char, - SW_RESSTR(STR_CHARACTERSTYLEFAMILY), + SwResId(STR_CHARACTERSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_CHAR)), - SW_RES(RID_CHARACTERSTYLEFAMILY))); + ResId(RID_CHARACTERSTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Frame, - SW_RESSTR(STR_FRAMESTYLEFAMILY), + SwResId(STR_FRAMESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_FRAME)), - SW_RES(RID_FRAMESTYLEFAMILY))); + ResId(RID_FRAMESTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Page, - SW_RESSTR(STR_PAGESTYLEFAMILY), + SwResId(STR_PAGESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_PAGE)), - SW_RES(RID_PAGESTYLEFAMILY))); + ResId(RID_PAGESTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Pseudo, - SW_RESSTR(STR_LISTSTYLEFAMILY), + SwResId(STR_LISTSTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_LIST)), - SW_RES(RID_LISTSTYLEFAMILY))); + ResId(RID_LISTSTYLEFAMILY, *pSwResMgr))); pStyleFamilies->emplace_back(SfxStyleFamilyItem(SfxStyleFamily::Table, - SW_RESSTR(STR_TABLESTYLEFAMILY), + SwResId(STR_TABLESTYLEFAMILY), Image(BitmapEx(BMP_STYLES_FAMILY_TABLE)), - SW_RES(RID_TABLESTYLEFAMILY))); + ResId(RID_TABLESTYLEFAMILY, *pSwResMgr))); return pStyleFamilies; } |