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-21 19:28:59 +0200 |
commit | d666c2f87d56da1f4dd3d421665ac3078c447a17 (patch) | |
tree | fb837b5b12955d94c06e1abdb0ccb09ceb901607 /sw/source/core/undo/unins.cxx | |
parent | d3ba63909740262e0cd64648e2eb00096b4626d2 (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>
(cherry picked from commit 2155e04d6343638ca9815d394cbc4f78c2b17c3a)
drop toString
Change-Id: I0f67c8931523bbe90bfbc8cc7d9a5bd523758ee5
(cherry picked from commit 8b1101023f01b2c7478a014b5ead73ada4fd4861)
pNameResId is unused
Change-Id: Ic1fe6abc7066517187695266c4d1a0888b41ffe7
(cherry picked from commit c2667d7ff558a1b7bf83e694909465f00d1a16f6)
Reviewed-on: https://gerrit.libreoffice.org/37843
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/core/undo/unins.cxx')
-rw-r--r-- | sw/source/core/undo/unins.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 78528a4a7f31..b407bbd69491 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -468,7 +468,7 @@ SwRewriter SwUndoInsert::GetRewriter() const { OUString aString = ShortenString(DenoteSpecialCharacters(*pStr), nUndoStringLength, - OUString(SW_RES(STR_LDOTS))); + SwResId(STR_LDOTS)); aResult.AddRule(UndoArg1, aString); @@ -541,13 +541,13 @@ MakeUndoReplaceRewriter(sal_uLong const occurrences, if (1 < occurrences) { aResult.AddRule(UndoArg1, OUString::number(occurrences)); - aResult.AddRule(UndoArg2, OUString(SW_RES(STR_OCCURRENCES_OF))); + aResult.AddRule(UndoArg2, SwResId(STR_OCCURRENCES_OF)); OUString aTmpStr; - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); aTmpStr += ShortenString(sOld, nUndoStringLength, - SW_RES(STR_LDOTS)); - aTmpStr += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aTmpStr += SwResId(STR_END_QUOTE); aResult.AddRule(UndoArg3, aTmpStr); } else if (1 == occurrences) @@ -555,24 +555,24 @@ MakeUndoReplaceRewriter(sal_uLong const occurrences, { OUString aTmpStr; - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); // #i33488 # aTmpStr += ShortenString(sOld, nUndoStringLength, - SW_RES(STR_LDOTS)); - aTmpStr += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aTmpStr += SwResId(STR_END_QUOTE); aResult.AddRule(UndoArg1, aTmpStr); } - aResult.AddRule(UndoArg2, OUString(SW_RES(STR_YIELDS))); + aResult.AddRule(UndoArg2, SwResId(STR_YIELDS)); { OUString aTmpStr; - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); // #i33488 # aTmpStr += ShortenString(sNew, nUndoStringLength, - SW_RES(STR_LDOTS)); - aTmpStr += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aTmpStr += SwResId(STR_END_QUOTE); aResult.AddRule(UndoArg3, aTmpStr); } } @@ -1031,10 +1031,10 @@ SwRewriter SwUndoInsertLabel::CreateRewriter(const OUString &rStr) if (!rStr.isEmpty()) { - aTmpStr += SW_RES(STR_START_QUOTE); + aTmpStr += SwResId(STR_START_QUOTE); aTmpStr += ShortenString(rStr, nUndoStringLength, - OUString(SW_RES(STR_LDOTS))); - aTmpStr += SW_RES(STR_END_QUOTE); + SwResId(STR_LDOTS)); + aTmpStr += SwResId(STR_END_QUOTE); } aRewriter.AddRule(UndoArg1, aTmpStr); |