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 /sfx2/source/doc/doctempl.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 'sfx2/source/doc/doctempl.cxx')
| -rw-r--r-- | sfx2/source/doc/doctempl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 3689525987c2..ca3ebf2428be 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -494,7 +494,7 @@ OUString SfxDocumentTemplates::ConvertResourceString(const OUString& rString) for (int i = 0; i < NUM_TEMPLATE_NAMES; ++i) { if (rString == aTemplateNames[i]) - return SFX2_RESSTR(STR_TEMPLATE_NAME1 + i); + return SfxResId(STR_TEMPLATE_NAME1 + i); } return rString; } @@ -1604,7 +1604,7 @@ bool SfxDocTemplate_Impl::Construct( ) mbConstructed = true; maRootURL = aRootContent->getIdentifier()->getContentIdentifier(); - ResStringArray aLongNames( SfxResId( TEMPLATE_LONG_NAMES_ARY ) ); + ResStringArray aLongNames(ResId(TEMPLATE_LONG_NAMES_ARY, *SfxResMgr::GetResMgr())); if ( aLongNames.Count() ) maStandardGroup = aLongNames.GetString( 0 ); |