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/wrtsh/wrtsh1.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/wrtsh/wrtsh1.cxx')
-rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index eaff182e80f7..1fa40eb160d7 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -209,12 +209,12 @@ void SwWrtShell::Insert( const OUString &rStr ) SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, GetCursorDescr()); - aRewriter.AddRule(UndoArg2, OUString(SW_RES(STR_YIELDS))); + aRewriter.AddRule(UndoArg2, OUString(SwResId(STR_YIELDS))); { OUString aTmpStr; - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); aTmpStr += rStr; - aTmpStr += SW_RES(STR_END_QUOTE); + aTmpStr += SwResId(STR_END_QUOTE); aRewriter.AddRule(UndoArg3, rStr); } @@ -248,7 +248,7 @@ void SwWrtShell::Insert( const OUString &rPath, const OUString &rFilter, StartAllAction(); SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, SW_RES(STR_GRAPHIC)); + aRewriter.AddRule(UndoArg1, SwResId(STR_GRAPHIC)); StartUndo(SwUndoId::INSERT, &aRewriter); @@ -554,11 +554,11 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrame SwRewriter aRewriter; if ( bStarMath ) - aRewriter.AddRule(UndoArg1, SW_RES(STR_MATH_FORMULA)); + aRewriter.AddRule(UndoArg1, SwResId(STR_MATH_FORMULA)); else if ( SotExchange::IsChart( aCLSID ) ) - aRewriter.AddRule(UndoArg1, SW_RES(STR_CHART)); + aRewriter.AddRule(UndoArg1, SwResId(STR_CHART)); else - aRewriter.AddRule(UndoArg1, SW_RES(STR_OLE)); + aRewriter.AddRule(UndoArg1, SwResId(STR_OLE)); EndUndo(SwUndoId::INSERT, &aRewriter); @@ -1598,15 +1598,15 @@ void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar ) StartAllAction(); OUString aTmpStr1; - aTmpStr1 += SW_RES(STR_START_QUOTE); + aTmpStr1 += SwResId(STR_START_QUOTE); aTmpStr1 += GetSelText(); - aTmpStr1 += SW_RES(STR_END_QUOTE); + aTmpStr1 += SwResId(STR_END_QUOTE); OUString aTmpStr3; - aTmpStr3 += SW_RES(STR_START_QUOTE); + aTmpStr3 += SwResId(STR_START_QUOTE); aTmpStr3 += OUStringLiteral1(cChar); - aTmpStr3 += SW_RES(STR_END_QUOTE); + aTmpStr3 += SwResId(STR_END_QUOTE); aRewriter.AddRule( UndoArg1, aTmpStr1 ); - aRewriter.AddRule( UndoArg2, SW_RES(STR_YIELDS) ); + aRewriter.AddRule( UndoArg2, SwResId(STR_YIELDS) ); aRewriter.AddRule( UndoArg3, aTmpStr3 ); StartUndo( SwUndoId::REPLACE, &aRewriter ); @@ -1720,7 +1720,7 @@ OUString SwWrtShell::GetSelDescr() const switch (nSelType) { case SelectionType::Graphic: - aResult = SW_RESSTR(STR_GRAPHIC); + aResult = SwResId(STR_GRAPHIC); break; case SelectionType::Frame: @@ -1733,7 +1733,7 @@ OUString SwWrtShell::GetSelDescr() const break; case SelectionType::DrawObject: { - aResult = SW_RESSTR(STR_DRAWING_OBJECTS); + aResult = SwResId(STR_DRAWING_OBJECTS); } break; default: |