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/dbui/mailmergewizard.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/dbui/mailmergewizard.cxx')
-rw-r--r-- | sw/source/ui/dbui/mailmergewizard.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 927a09825e0c..cc6ba7230bf7 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -43,19 +43,19 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeC m_pSwView(&rView), m_bDocumentLoad( false ), m_xConfigItem(rItem), - m_sStarting( SW_RES( ST_STARTING )), - m_sDocumentType( SW_RES( ST_DOCUMENTTYPE )), - m_sAddressBlock( SW_RES( ST_ADDRESSBLOCK )), - m_sAddressList( SW_RES( ST_ADDRESSLIST )), - m_sGreetingsLine( SW_RES( ST_GREETINGSLINE )), - m_sLayout( SW_RES( ST_LAYOUT )), - m_sFinish( SW_RES( ST_FINISH )), + m_sStarting( SwResId( ST_STARTING )), + m_sDocumentType( SwResId( ST_DOCUMENTTYPE )), + m_sAddressBlock( SwResId( ST_ADDRESSBLOCK )), + m_sAddressList( SwResId( ST_ADDRESSLIST )), + m_sGreetingsLine( SwResId( ST_GREETINGSLINE )), + m_sLayout( SwResId( ST_LAYOUT )), + m_sFinish( SwResId( ST_FINISH )), m_nRestartPage( MM_DOCUMENTSELECTPAGE ) { defaultButton(WizardButtonFlags::NEXT); enableButtons(WizardButtonFlags::FINISH, false); - setTitleBase(SW_RESSTR( ST_MMWTITLE ) ); + setTitleBase(SwResId( ST_MMWTITLE ) ); m_pFinish->SetText(m_sFinish); m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE); |