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>

1 files changed, 3 insertions, 3 deletions

diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index ce309cb135e9..2dcc463a840e 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -97,9 +97,9 @@ ScRange ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
     for( ; pIterator->hasNext(); pIterator->next() )
     {
         if (mGroupedBy == BY_COLUMN)
-            aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
+            aTemplate.setTemplate(ScResId(STR_COLUMN_LABEL_TEMPLATE));
         else
-            aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
+            aTemplate.setTemplate(ScResId(STR_ROW_LABEL_TEMPLATE));
 
         aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1);
         aOutput.writeBoldString(aTemplate.getTemplate());
@@ -112,7 +112,7 @@ ScRange ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
     // Write calculation labels
     for(sal_Int32 i = 0; lclCalcDefinitions[i].aFormula != nullptr; i++)
     {
-        OUString aLabel(SC_RESSTR(lclCalcDefinitions[i].aCalculationNameId));
+        OUString aLabel(ScResId(lclCalcDefinitions[i].aCalculationNameId));
         aOutput.writeString(aLabel);
         aOutput.nextRow();
     }