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/ui/table/tautofmt.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/ui/table/tautofmt.cxx')
| -rw-r--r-- | sw/source/ui/table/tautofmt.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 0af33923bf71..5e5701f3ce80 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -142,13 +142,13 @@ void SwStringInputDlg::dispose() SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell, bool bAutoFormat, const SwTableAutoFormat* pSelFormat ) : SfxModalDialog(pParent, "AutoFormatTableDialog", "modules/swriter/ui/autoformattable.ui") - , aStrTitle(SW_RES(STR_ADD_AUTOFORMAT_TITLE)) - , aStrLabel(SW_RES(STR_ADD_AUTOFORMAT_LABEL)) - , aStrClose(SW_RES(STR_BTN_AUTOFORMAT_CLOSE)) - , aStrDelTitle(SW_RES(STR_DEL_AUTOFORMAT_TITLE)) - , aStrDelMsg(SW_RES(STR_DEL_AUTOFORMAT_MSG)) - , aStrRenameTitle(SW_RES(STR_RENAME_AUTOFORMAT_TITLE)) - , aStrInvalidFormat(SW_RES(STR_INVALID_AUTOFORMAT_NAME)) + , aStrTitle(SwResId(STR_ADD_AUTOFORMAT_TITLE)) + , aStrLabel(SwResId(STR_ADD_AUTOFORMAT_LABEL)) + , aStrClose(SwResId(STR_BTN_AUTOFORMAT_CLOSE)) + , aStrDelTitle(SwResId(STR_DEL_AUTOFORMAT_TITLE)) + , aStrDelMsg(SwResId(STR_DEL_AUTOFORMAT_MSG)) + , aStrRenameTitle(SwResId(STR_RENAME_AUTOFORMAT_TITLE)) + , aStrInvalidFormat(SwResId(STR_INVALID_AUTOFORMAT_NAME)) , pShell(pWrtShell) , nIndex(0) , nDfltStylePos(0) @@ -509,13 +509,13 @@ AutoFormatPreview::AutoFormatPreview(vcl::Window* pParent, WinBits nStyle) : aVD ( VclPtr<VirtualDevice>::Create(*this) ), bFitWidth ( false ), mbRTL ( false ), - aStrJan ( SW_RES( STR_JAN ) ), - aStrFeb ( SW_RES( STR_FEB ) ), - aStrMar ( SW_RES( STR_MAR ) ), - aStrNorth ( SW_RES( STR_NORTH ) ), - aStrMid ( SW_RES( STR_MID ) ), - aStrSouth ( SW_RES( STR_SOUTH ) ), - aStrSum ( SW_RES( STR_SUM ) ) + aStrJan ( SwResId( STR_JAN ) ), + aStrFeb ( SwResId( STR_FEB ) ), + aStrMar ( SwResId( STR_MAR ) ), + aStrNorth ( SwResId( STR_NORTH ) ), + aStrMid ( SwResId( STR_MID ) ), + aStrSouth ( SwResId( STR_SOUTH ) ), + aStrSum ( SwResId( STR_SUM ) ) { uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); m_xBreak = i18n::BreakIterator::create(xContext); |