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 /sd/source/ui/dlg/unchss.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 'sd/source/ui/dlg/unchss.cxx')
-rw-r--r-- | sd/source/ui/dlg/unchss.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index 7b6842539fbe..1e0b6d99a5a1 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -51,7 +51,7 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, mpOldSet = o3tl::make_unique<SfxItemSet>(static_cast<SfxItemPool&>(SdrObject::GetGlobalDrawObjectItemPool()), mpStyleSheet->GetItemSet().GetRanges()); SdrModel::MigrateItemSet( &mpStyleSheet->GetItemSet(), mpOldSet.get(), pTheDoc ); - OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT)); + OUString aComment(SdResId(STR_UNDO_CHANGE_PRES_OBJECT)); OUString aName(mpStyleSheet->GetName()); // delete layout name and separator @@ -61,27 +61,27 @@ StyleSheetUndoAction::StyleSheetUndoAction(SdDrawDocument* pTheDoc, if (aName == STR_LAYOUT_TITLE) { - aName = SD_RESSTR(STR_PSEUDOSHEET_TITLE); + aName = SdResId(STR_PSEUDOSHEET_TITLE); } else if (aName == STR_LAYOUT_SUBTITLE) { - aName = SD_RESSTR(STR_PSEUDOSHEET_SUBTITLE); + aName = SdResId(STR_PSEUDOSHEET_SUBTITLE); } else if (aName == STR_LAYOUT_BACKGROUND) { - aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUND); + aName = SdResId(STR_PSEUDOSHEET_BACKGROUND); } else if (aName == STR_LAYOUT_BACKGROUNDOBJECTS) { - aName = SD_RESSTR(STR_PSEUDOSHEET_BACKGROUNDOBJECTS); + aName = SdResId(STR_PSEUDOSHEET_BACKGROUNDOBJECTS); } else if (aName == STR_LAYOUT_NOTES) { - aName = SD_RESSTR(STR_PSEUDOSHEET_NOTES); + aName = SdResId(STR_PSEUDOSHEET_NOTES); } else { - OUString aOutlineStr(SD_RESSTR(STR_PSEUDOSHEET_OUTLINE)); + OUString aOutlineStr(SdResId(STR_PSEUDOSHEET_OUTLINE)); nPos = aName.indexOf(aOutlineStr); if (nPos != -1) { |