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, 11 insertions, 11 deletions

diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 68bc88dae26a..6d4d476c173c 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -231,7 +231,7 @@ namespace dbp
                     nCommandTypeResourceId = RID_STR_TYPE_COMMAND;
                     break;
             }
-            m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId).toString());
+            m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId));
         }
 
         OControlWizardPage_Base::initializePage();
@@ -607,7 +607,7 @@ namespace dbp
 
             // prepend an extra SQLContext explaining what we were doing
             SQLContext aContext;
-            aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE).toString();
+            aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE);
             aContext.NextException = aSQLException;
 
             // create an interaction handler to display this exception
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 8be4a22e91e9..9db743904aa4 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -60,7 +60,7 @@ namespace dbp
         m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT);
         m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL);
         m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH);
-        setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE).toString());
+        setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE));
 
         // if we do not need the data source selection page ...
         if (!needDatasourceSelection())
@@ -160,11 +160,11 @@ namespace dbp
 
                 case DataType::TIMESTAMP:
                     aColumnServiceNames.push_back(OUString("DateField"));
-                    aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX).toString());
+                    aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX));
 
                     aFormFieldNames.push_back(*pSelectedFields);
                     aColumnServiceNames.push_back(OUString("TimeField"));
-                    aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX).toString());
+                    aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX));
                     break;
 
                 default:
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index ddb34e420b60..ab44cefe5bb1 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -55,7 +55,7 @@ namespace dbp
         m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT);
         m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL);
         m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH);
-        setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE).toString());
+        setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE));
     }
 
 
@@ -468,7 +468,7 @@ namespace dbp
     OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent )
         :ODBFieldPage(_pParent)
     {
-        setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString());
+        setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD));
     }
 
 
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index d935d0a98b0c..b3bb2e6ffbad 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -73,11 +73,11 @@ namespace dbp
         {
             case FormComponentType::LISTBOX:
                 m_bListBox = true;
-                setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE).toString());
+                setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE));
                 return true;
             case FormComponentType::COMBOBOX:
                 m_bListBox = false;
-                setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE).toString());
+                setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE));
                 return true;
         }
         return false;
@@ -354,7 +354,7 @@ namespace dbp
         get(m_pSelectTableField, "selectfield");
         get(m_pDisplayedField, "displayfield");
         get(m_pInfo, "info");
-        m_pInfo->SetText(ModuleRes( isListBox() ? RID_STR_FIELDINFO_LISTBOX : RID_STR_FIELDINFO_COMBOBOX).toString());
+        m_pInfo->SetText(ModuleRes( isListBox() ? RID_STR_FIELDINFO_LISTBOX : RID_STR_FIELDINFO_COMBOBOX));
         m_pSelectTableField->SetSelectHdl(LINK(this, OContentFieldSelection, OnFieldSelected));
         m_pSelectTableField->SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked));
     }
@@ -505,7 +505,7 @@ namespace dbp
     OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent )
         :ODBFieldPage(_pParent)
     {
-        setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString());
+        setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD));
     }