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>

4 files changed, 14 insertions, 14 deletions

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 05f541ecc730..421ed22c59c9 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1395,7 +1395,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
                     PrintMonitor *pPrintMonDlg = static_cast<PrintMonitor*>( pProgressDlg.get() );
                     pPrintMonDlg->m_pPrinter->SetText( bNeedsTempFiles
                         ? aTempFileURL->GetBase() : pSourceDocSh->GetTitle( 22 ) );
-                    OUString sStat( SW_RES(STR_STATSTR_LETTER) );
+                    OUString sStat( SwResId(STR_STATSTR_LETTER) );
                     sStat += " " + OUString::number( nDocNo );
                     pPrintMonDlg->m_pPrintInfo->SetText( sStat );
                 }
@@ -2563,17 +2563,17 @@ OUString SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell)
 
     uno::Reference<ui::dialogs::XFilterManager> xFltMgr(xFP, uno::UNO_QUERY);
 
-    OUString sFilterAll(SW_RES(STR_FILTER_ALL));
-    OUString sFilterAllData(SW_RES(STR_FILTER_ALL_DATA));
-    OUString sFilterSXB(SW_RES(STR_FILTER_SXB));
-    OUString sFilterSXC(SW_RES(STR_FILTER_SXC));
-    OUString sFilterDBF(SW_RES(STR_FILTER_DBF));
-    OUString sFilterXLS(SW_RES(STR_FILTER_XLS));
-    OUString sFilterTXT(SW_RES(STR_FILTER_TXT));
-    OUString sFilterCSV(SW_RES(STR_FILTER_CSV));
+    OUString sFilterAll(SwResId(STR_FILTER_ALL));
+    OUString sFilterAllData(SwResId(STR_FILTER_ALL_DATA));
+    OUString sFilterSXB(SwResId(STR_FILTER_SXB));
+    OUString sFilterSXC(SwResId(STR_FILTER_SXC));
+    OUString sFilterDBF(SwResId(STR_FILTER_DBF));
+    OUString sFilterXLS(SwResId(STR_FILTER_XLS));
+    OUString sFilterTXT(SwResId(STR_FILTER_TXT));
+    OUString sFilterCSV(SwResId(STR_FILTER_CSV));
 #ifdef _WIN32
-    OUString sFilterMDB(SW_RES(STR_FILTER_MDB));
-    OUString sFilterACCDB(SW_RES(STR_FILTER_ACCDB));
+    OUString sFilterMDB(SwResId(STR_FILTER_MDB));
+    OUString sFilterACCDB(SwResId(STR_FILTER_ACCDB));
 #endif
     xFltMgr->appendFilter( sFilterAll, "*" );
     xFltMgr->appendFilter( sFilterAllData, "*.ods;*.sxc;*.dbf;*.xls;*.txt;*.csv");
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 54dde02de306..1bbbfc5d76c5 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -465,7 +465,7 @@ OUString SwAddressPreview::FillData(
     const OUString* pAssignment = aAssignment.getConstArray();
     const ResStringArray& rDefHeaders = rConfigItem.GetDefaultAddressHeaders();
     OUString sAddress(rAddress);
-    OUString sNotAssigned = "<" + OUString(SW_RES(STR_NOTASSIGNED)) + ">";
+    OUString sNotAssigned = "<" + SwResId(STR_NOTASSIGNED) + ">";
 
     bool bIncludeCountry = rConfigItem.IsIncludeCountry();
     const OUString rExcludeCountry = rConfigItem.GetExcludeCountry();
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index 5aa6e0d88f15..8a4a10f7a2eb 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -245,7 +245,7 @@ uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const un
     {
         // make it visible
         m_pExcludeCheckbox = VclPtr<CheckBox>::Create(pToolbar);
-        m_pExcludeCheckbox->SetText(SW_RES(ST_EXCLUDE));
+        m_pExcludeCheckbox->SetText(SwResId(ST_EXCLUDE));
         m_pExcludeCheckbox->SetSizePixel(m_pExcludeCheckbox->GetOptimalSize());
 
         m_pExcludeCheckbox->SetToggleHdl(LINK(this, MMExcludeEntryController, ExcludeHdl));
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 9747e192fc9c..cabe4be6bbb0 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -200,7 +200,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
         m_bIsAuthentication(false),
 
         m_bIsEMailSupported(false),
-        m_AddressHeaderSA( SW_RES( SA_ADDRESS_HEADER )),
+        m_AddressHeaderSA(ResId(SA_ADDRESS_HEADER, *pSwResMgr)),
         m_bUserSettingWereOverwritten(false),
         m_bIsAddressBlock_LastUserSetting(false),
         m_bIsGreetingLineInMail_LastUserSetting(false),