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/core/tox | |
| 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/core/tox')
| -rw-r--r-- | sw/source/core/tox/tox.cxx | 10 | ||||
| -rw-r--r-- | sw/source/core/tox/txmsrt.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index e53f07aa1ee6..b6baa1366d96 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -245,7 +245,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType ) { SwFormToken aLinkStt (TOKEN_LINK_START); - aLinkStt.sCharStyleName = SW_RES(STR_POOLCHR_TOXJUMP); + aLinkStt.sCharStyleName = SwResId(STR_POOLCHR_TOXJUMP); aTokens.push_back(aLinkStt); } @@ -273,7 +273,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType) aTokens.push_back(SwFormToken(TOKEN_LINK_END)); - SetTemplate( 0, SW_RESSTR( nPoolId++ )); + SetTemplate( 0, SwResId( nPoolId++ )); if(TOX_INDEX == m_eType) { @@ -286,12 +286,12 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# aTmpTokens.push_back(aTmpToken); SetPattern( i, aTmpTokens ); - SetTemplate( i, SW_RESSTR( STR_POOLCOLL_TOX_IDXBREAK )); + SetTemplate( i, SwResId( STR_POOLCOLL_TOX_IDXBREAK )); } else { SetPattern( i, aTokens ); - SetTemplate( i, SW_RESSTR( STR_POOLCOLL_TOX_IDX1 + i - 2 )); + SetTemplate( i, SwResId( STR_POOLCOLL_TOX_IDX1 + i - 2 )); } } } @@ -313,7 +313,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# nPoolId = STR_POOLCOLL_TOX_USER6; else if( TOX_AUTHORITIES == m_eType ) nPoolId = STR_POOLCOLL_TOX_AUTHORITIES1; - SetTemplate( i, SW_RESSTR( nPoolId ) ); + SetTemplate( i, SwResId( nPoolId ) ); } } diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index c8f1a3592fcd..2a5d0b5d5b54 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -523,7 +523,7 @@ TextAndReading SwTOXPara::GetText_Impl() const : SwTOXElement::Graphic == eType ? STR_GRAPHIC_DEFNAME : STR_FRAME_DEFNAME; - return TextAndReading(SW_RESSTR( nId ), OUString()); + return TextAndReading(SwResId( nId ), OUString()); } break; default: break; @@ -633,7 +633,7 @@ TextAndReading SwTOXTable::GetText_Impl() const } OSL_ENSURE( false, "Where's my table?" ); - return TextAndReading(SW_RESSTR( STR_TABLE_DEFNAME ), OUString()); + return TextAndReading(SwResId( STR_TABLE_DEFNAME ), OUString()); } sal_uInt16 SwTOXTable::GetLevel() const |