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>

16 files changed, 105 insertions, 105 deletions

diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 26918937235f..4c62091840f8 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -182,7 +182,7 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke
     else
     {
         sal_Int16 aLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE;
-        OUString aLabelTemplate(SC_RESSTR(aLabelId));
+        OUString aLabelTemplate(ScResId(aLabelId));
 
         for (size_t i = 0; i < rRangeList.size(); i++)
         {
@@ -198,11 +198,11 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke
 
 void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output, FormulaTemplate& aTemplate)
 {
-    output.writeBoldString(SC_RESSTR(STR_ANOVA_SINGLE_FACTOR_LABEL));
+    output.writeBoldString(ScResId(STR_ANOVA_SINGLE_FACTOR_LABEL));
     output.newLine();
 
     double aAlphaValue = mpAlphaField->GetValue() / 100.0;
-    output.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+    output.writeString(ScResId(STR_LABEL_ALPHA));
     output.nextColumn();
     output.writeValue(aAlphaValue);
     aTemplate.autoReplaceAddress("%ALPHA%", output.current());
@@ -212,7 +212,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     // Write labels
     for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
     {
-        output.writeString(SC_RESSTR(lclBasicStatistics[i].aLabelId));
+        output.writeString(ScResId(lclBasicStatistics[i].aLabelId));
         output.nextColumn();
     }
     output.newLine();
@@ -244,7 +244,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     output.resetColumn();
     for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
     {
-        output.writeString(SC_RESSTR(lclAnovaLabels[i]));
+        output.writeString(ScResId(lclAnovaLabels[i]));
         output.nextColumn();
     }
     output.nextRow();
@@ -255,7 +255,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     {
         // Label
         output.resetColumn();
-        output.writeString(SC_RESSTR(STR_ANOVA_LABEL_BETWEEN_GROUPS));
+        output.writeString(ScResId(STR_ANOVA_LABEL_BETWEEN_GROUPS));
         output.nextColumn();
 
         // Sum of Squares
@@ -301,7 +301,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     {
         // Label
         output.resetColumn();
-        output.writeString(SC_RESSTR(STR_ANOVA_LABEL_WITHIN_GROUPS));
+        output.writeString(ScResId(STR_ANOVA_LABEL_WITHIN_GROUPS));
         output.nextColumn();
 
         // Sum of Squares
@@ -328,7 +328,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     {
         // Label
         output.resetColumn();
-        output.writeString(SC_RESSTR(STR_ANOVA_LABEL_TOTAL));
+        output.writeString(ScResId(STR_ANOVA_LABEL_TOTAL));
         output.nextColumn();
 
         // Sum of Squares
@@ -346,7 +346,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
 
 void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, FormulaTemplate& aTemplate)
 {
-    output.writeBoldString(SC_RESSTR(STR_ANOVA_TWO_FACTOR_LABEL));
+    output.writeBoldString(ScResId(STR_ANOVA_TWO_FACTOR_LABEL));
     output.newLine();
 
     double aAlphaValue = mpAlphaField->GetValue() / 100.0;
@@ -360,7 +360,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
     // Write labels
     for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
     {
-        output.writeString(SC_RESSTR(lclBasicStatistics[i].aLabelId));
+        output.writeString(ScResId(lclBasicStatistics[i].aLabelId));
         output.nextColumn();
     }
     output.newLine();
@@ -409,7 +409,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
     // Write ANOVA labels
     for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
     {
-        output.writeString(SC_RESSTR(lclAnovaLabels[i]));
+        output.writeString(ScResId(lclAnovaLabels[i]));
         output.nextColumn();
     }
     output.nextRow();
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index 0e5e1b3df014..1a7591a121e1 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -31,7 +31,7 @@ ScChiSquareTestDialog::ScChiSquareTestDialog(
             pSfxBindings, pChildWindow, pParent, pViewData,
             "ChiSquareTestDialog", "modules/scalc/ui/chisquaretestdialog.ui" )
 {
-    SetText(SC_RESSTR(STR_CHI_SQUARE_TEST));
+    SetText(ScResId(STR_CHI_SQUARE_TEST));
 }
 
 ScChiSquareTestDialog::~ScChiSquareTestDialog()
@@ -55,18 +55,18 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
 
     aTemplate.autoReplaceRange("%RANGE%", mInputRange);
 
-    aOutput.writeBoldString(SC_RESSTR(STR_CHI_SQUARE_TEST));
+    aOutput.writeBoldString(ScResId(STR_CHI_SQUARE_TEST));
     aOutput.newLine();
 
     // Alpha
-    aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+    aOutput.writeString(ScResId(STR_LABEL_ALPHA));
     aOutput.nextColumn();
     aOutput.writeValue(0.05);
     aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
     aOutput.newLine();
 
     // DF
-    aOutput.writeString(SC_RESSTR(STR_DEGREES_OF_FREEDOM_LABEL));
+    aOutput.writeString(ScResId(STR_DEGREES_OF_FREEDOM_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=(COLUMNS(%RANGE%) - 1) * (ROWS(%RANGE%) - 1)");
     aTemplate.autoReplaceAddress("%DEGREES_OF_FREEDOM%", aOutput.current());
@@ -74,7 +74,7 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // p Value
-    aOutput.writeString(SC_RESSTR(STR_P_VALUE_LABEL));
+    aOutput.writeString(ScResId(STR_P_VALUE_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=CHITEST(%RANGE%; MMULT(MMULT(%RANGE%;TRANSPOSE(IF(COLUMN(%RANGE%))));MMULT(TRANSPOSE(IF(ROW(%RANGE%)));%RANGE%)) / SUM(%RANGE%))");
     aTemplate.autoReplaceAddress("%P_VALUE%", aOutput.current());
@@ -82,14 +82,14 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Test Statistic
-    aOutput.writeString(SC_RESSTR(STR_TEST_STATISTIC_LABEL));
+    aOutput.writeString(ScResId(STR_TEST_STATISTIC_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=CHIINV(%P_VALUE%; %DEGREES_OF_FREEDOM%)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
     // Critical value
-    aOutput.writeString(SC_RESSTR(STR_CRITICAL_VALUE_LABEL));
+    aOutput.writeString(ScResId(STR_CRITICAL_VALUE_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=CHIINV(%ALPHA%; %DEGREES_OF_FREEDOM%)");
     aOutput.writeFormula(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
index 09254e39af72..7eafe239aa40 100644
--- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
@@ -28,7 +28,7 @@ bool ScCorrelationDialog::Close()
 
 const OUString ScCorrelationDialog::getLabel()
 {
-    return SC_RESSTR(STR_CORRELATION_LABEL);
+    return ScResId(STR_CORRELATION_LABEL);
 }
 
 const OUString ScCorrelationDialog::getTemplate()
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index bb35aa7dce0e..5506444bfd41 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -33,7 +33,7 @@ bool ScCovarianceDialog::Close()
 
 const OUString ScCovarianceDialog::getLabel()
 {
-    return SC_RESSTR(STR_COVARIANCE_LABEL);
+    return ScResId(STR_COVARIANCE_LABEL);
 }
 
 const OUString ScCovarianceDialog::getTemplate()
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();
     }
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index 0a7e5785340b..f5d679c3d339 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -66,7 +66,7 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
     double aSmoothingFactor = mpSmoothingFactor->GetValue() / 100.0;
 
     // Alpha
-    output.writeBoldString(SC_RESSTR(STR_LABEL_ALPHA));
+    output.writeBoldString(ScResId(STR_LABEL_ALPHA));
     output.nextRow();
 
     // Alpha Value
@@ -91,9 +91,9 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
 
         // Write column label
         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);
         output.writeBoldString(aTemplate.getTemplate());
         output.nextRow();
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index 57b4ac77e0f0..a3cc2cb8b2b1 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -32,7 +32,7 @@ ScFTestDialog::ScFTestDialog(
             pSfxBindings, pChildWindow, pParent, pViewData,
             "TTestDialog", "modules/scalc/ui/ttestdialog.ui" )
 {
-    SetText(SC_RESSTR(STR_FTEST));
+    SetText(ScResId(STR_FTEST));
 }
 
 ScFTestDialog::~ScFTestDialog()
@@ -69,23 +69,23 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
     aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
 
-    aOutput.writeBoldString(SC_RESSTR(STR_FTEST_UNDO_NAME));
+    aOutput.writeBoldString(ScResId(STR_FTEST_UNDO_NAME));
     aOutput.newLine();
 
     // Alpha
-    aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+    aOutput.writeString(ScResId(STR_LABEL_ALPHA));
     aOutput.nextColumn();
     aOutput.writeValue(0.05);
     aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
     aOutput.newLine();
 
     aOutput.nextColumn();
-    aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
+    aOutput.writeBoldString(ScResId(STR_VARIABLE_1_LABEL));
     aOutput.nextColumn();
-    aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
+    aOutput.writeBoldString(ScResId(STR_VARIABLE_2_LABEL));
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
+    aOutput.writeString(ScResId(STRID_CALC_MEAN));
     aOutput.nextColumn();
     aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -94,7 +94,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STRID_CALC_VARIANCE));
+    aOutput.writeString(ScResId(STRID_CALC_VARIANCE));
     aOutput.nextColumn();
     aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -105,7 +105,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aTemplate.autoReplaceAddress("%VARIABLE2_VARIANCE%", aOutput.current());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
+    aOutput.writeString(ScResId(STR_OBSERVATIONS_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -116,7 +116,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aTemplate.autoReplaceAddress("%VARIABLE2_OBSERVATIONS%", aOutput.current());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_DF));
+    aOutput.writeString(ScResId(STR_ANOVA_LABEL_DF));
     aOutput.nextColumn();
     aTemplate.setTemplate("=%VARIABLE1_OBSERVATIONS% - 1");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -127,46 +127,46 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aTemplate.autoReplaceAddress("%VARIABLE2_DEGREE_OF_FREEDOM%", aOutput.current());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_F));
+    aOutput.writeString(ScResId(STR_ANOVA_LABEL_F));
     aOutput.nextColumn();
     aTemplate.setTemplate("=%VARIABLE1_VARIANCE% / %VARIABLE2_VARIANCE%");
     aOutput.writeFormula(aTemplate.getTemplate());
     aTemplate.autoReplaceAddress("%F_VALUE%", aOutput.current());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_FTEST_P_RIGHT_TAIL));
+    aOutput.writeString(ScResId(STR_FTEST_P_RIGHT_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=FDIST(%F_VALUE%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aTemplate.autoReplaceAddress("%P_RIGHT_TAIL_VALUE%", aOutput.current());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_RIGHT_TAIL));
+    aOutput.writeString(ScResId(STR_FTEST_F_CRITICAL_RIGHT_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=FINV(%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_FTEST_P_LEFT_TAIL));
+    aOutput.writeString(ScResId(STR_FTEST_P_LEFT_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=1 - %P_RIGHT_TAIL_VALUE%");
     aOutput.writeFormula(aTemplate.getTemplate());
     aTemplate.autoReplaceAddress("%P_LEFT_TAIL_VALUE%", aOutput.current());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_LEFT_TAIL));
+    aOutput.writeString(ScResId(STR_FTEST_F_CRITICAL_LEFT_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=FINV(1-%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_FTEST_P_TWO_TAIL));
+    aOutput.writeString(ScResId(STR_FTEST_P_TWO_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=2*MIN(%P_RIGHT_TAIL_VALUE%; %P_LEFT_TAIL_VALUE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_TWO_TAIL));
+    aOutput.writeString(ScResId(STR_FTEST_F_CRITICAL_TWO_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=FINV(1-(%ALPHA%/2); %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
     aOutput.writeFormula(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 413e8c9be2ab..5d02286c98e9 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -86,9 +86,9 @@ ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
     for (size_t i = 0; i < aRangeList.size(); i++)
     {
         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(strWildcardNumber, i + 1);
         output.writeString(aTemplate.getTemplate());
@@ -101,9 +101,9 @@ ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
     for (size_t i = 0; i < aRangeList.size(); i++)
     {
         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(strWildcardNumber, i + 1);
         output.writeString(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
index 7ea5fadbbff5..540dd33e721c 100644
--- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
@@ -77,9 +77,9 @@ ScRange ScMovingAverageDialog::ApplyOutput(ScDocShell* pDocShell)
 
         // Write label
         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);
         output.writeBoldString(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index eb639e60cc92..1c6e40b5a60a 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -281,8 +281,8 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
 template<class RNG>
 void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, boost::optional<sal_Int8> aDecimalPlaces)
 {
-    OUString aUndo = SC_RESSTR(STR_UNDO_DISTRIBUTION_TEMPLATE);
-    OUString aDistributionName = SC_RESSTR(aDistributionStringId);
+    OUString aUndo = ScResId(STR_UNDO_DISTRIBUTION_TEMPLATE);
+    OUString aDistributionName = ScResId(aDistributionStringId);
     aUndo = aUndo.replaceAll("$(DISTRIBUTION)",  aDistributionName);
 
     ScDocShell* pDocShell = mpViewData->GetDocShell();
@@ -435,19 +435,19 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
     {
         case DIST_UNIFORM:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MINIMUM));
-            mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MAXIMUM));
+            mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_MINIMUM));
+            mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_MAXIMUM));
             mpParameter2Text->Show();
             mpParameter2Value->Show();
             break;
         }
         case DIST_UNIFORM_INTEGER:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MINIMUM));
+            mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_MINIMUM));
             mpParameter1Value->SetDecimalDigits(0);
             mpParameter1Value->SetSpinSize(1);
 
-            mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MAXIMUM));
+            mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_MAXIMUM));
             mpParameter2Value->SetDecimalDigits(0);
             mpParameter2Value->SetSpinSize(1);
 
@@ -457,16 +457,16 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
         }
         case DIST_NORMAL:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MEAN));
-            mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_DEVIATION));
+            mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_MEAN));
+            mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_DEVIATION));
             mpParameter2Text->Show();
             mpParameter2Value->Show();
             break;
         }
         case DIST_CAUCHY:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_MEDIAN));
-            mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_SIGMA));
+            mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_MEDIAN));
+            mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_SIGMA));
             mpParameter2Text->Show();
             mpParameter2Value->Show();
             break;
@@ -474,7 +474,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
         case DIST_BERNOULLI:
         case DIST_GEOMETRIC:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
+            mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
             mpParameter1Value->SetMin(         0 );
             mpParameter1Value->SetMax( PERCISION );
             mpParameter1Value->SetSpinSize(1000);
@@ -486,12 +486,12 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
         case DIST_BINOMIAL:
         case DIST_NEGATIVE_BINOMIAL:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
+            mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
             mpParameter1Value->SetMin(         0 );
             mpParameter1Value->SetMax( PERCISION );
             mpParameter1Value->SetSpinSize(1000);
 
-            mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS));
+            mpParameter2Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS));
             mpParameter2Value->SetDecimalDigits(0);
             mpParameter2Value->SetSpinSize(1);
             mpParameter2Value->SetMin(0);
@@ -502,7 +502,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
         }
         case DIST_CHI_SQUARED:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_NU_VALUE));
+            mpParameter1Text->SetText(ScResId(STR_RNG_PARAMETER_STANDARD_NU_VALUE));
 
             mpParameter2Text->Hide();
             mpParameter2Value->Hide();
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 272b4b541c1f..6950c8dea61f 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -128,31 +128,31 @@ ScRange ScRegressionDialog::ApplyOutput(ScDocShell* pDocShell)
     aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
     aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
 
-    aOutput.writeBoldString(SC_RESSTR(STR_REGRESSION));
+    aOutput.writeBoldString(ScResId(STR_REGRESSION));
     aOutput.newLine();
     aOutput.newLine();
     aOutput.push();
 
     // REGRESSION MODEL
-    aOutput.writeString(SC_RESSTR(STR_LABEL_REGRESSION_MODEL));
+    aOutput.writeString(ScResId(STR_LABEL_REGRESSION_MODEL));
     aOutput.nextRow();
 
     // RSQUARED
-    aOutput.writeString(SC_RESSTR(STR_LABEL_RSQUARED));
+    aOutput.writeString(ScResId(STR_LABEL_RSQUARED));
     aOutput.nextRow();
 
     // Standard Error
-    aOutput.writeString(SC_RESSTR(STRID_CALC_STD_ERROR));
+    aOutput.writeString(ScResId(STRID_CALC_STD_ERROR));
     aOutput.nextRow();
 
     aOutput.nextRow();
 
     // Slope
-    aOutput.writeString(SC_RESSTR(STR_LABEL_SLOPE));
+    aOutput.writeString(ScResId(STR_LABEL_SLOPE));
     aOutput.nextRow();
 
     // Intercept
-    aOutput.writeString(SC_RESSTR(STR_LABEL_INTERCEPT));
+    aOutput.writeString(ScResId(STR_LABEL_INTERCEPT));
     aOutput.nextRow();
 
     aOutput.nextRow();
@@ -192,7 +192,7 @@ ScRange ScRegressionDialog::ApplyOutput(ScDocShell* pDocShell)
         nColumn += 1;
 
         // REGRESSION MODEL
-        aOutput.writeString(SC_RESSTR(constRegressionModel[nRegressionIndex]));
+        aOutput.writeString(ScResId(constRegressionModel[nRegressionIndex]));
         aOutput.nextRow();
 
         // RSQUARED
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index dd31179d3bcf..7f683556bb65 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -265,7 +265,7 @@ ScRange ScSamplingDialog::PerformRandomSampling(ScDocShell* pDocShell)
 
 void ScSamplingDialog::PerformSampling()
 {
-    OUString aUndo(SC_RESSTR(STR_SAMPLING_UNDO_NAME));
+    OUString aUndo(ScResId(STR_SAMPLING_UNDO_NAME));
     ScDocShell* pDocShell = mViewData->GetDocShell();
     svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
 
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 5d6025ac7449..ef60c05147e2 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -283,7 +283,7 @@ IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, RefInputModifyHandler, Edit&, vo
 
 void ScStatisticsInputOutputDialog::CalculateInputAndWriteToOutput()
 {
-    OUString aUndo(SC_RESSTR(GetUndoNameId()));
+    OUString aUndo(ScResId(GetUndoNameId()));
     ScDocShell* pDocShell = mViewData->GetDocShell();
     svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
     pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() );
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 90dcea171573..c66d7173ac84 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -322,7 +322,7 @@ IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, vo
 
 void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput()
 {
-    OUString aUndo(SC_RESSTR(GetUndoNameId()));
+    OUString aUndo(ScResId(GetUndoNameId()));
     ScDocShell* pDocShell = mViewData->GetDocShell();
     svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
     pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() );
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index 8509f72d6226..a94c82943dd6 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -32,7 +32,7 @@ ScTTestDialog::ScTTestDialog(
             pSfxBindings, pChildWindow, pParent, pViewData,
             "TTestDialog", "modules/scalc/ui/ttestdialog.ui" )
 {
-    SetText(SC_RESSTR(STR_TTEST));
+    SetText(ScResId(STR_TTEST));
 }
 
 ScTTestDialog::~ScTTestDialog()
@@ -69,30 +69,30 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
     aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
 
-    aOutput.writeBoldString(SC_RESSTR(STR_TTEST_UNDO_NAME));
+    aOutput.writeBoldString(ScResId(STR_TTEST_UNDO_NAME));
     aOutput.newLine();
 
     // Alpha
-    aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+    aOutput.writeString(ScResId(STR_LABEL_ALPHA));
     aOutput.nextColumn();
     aOutput.writeValue(0.05);
     aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
     aOutput.newLine();
 
     // Hypothesized mean difference
-    aOutput.writeString(SC_RESSTR(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
+    aOutput.writeString(ScResId(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
     aOutput.nextColumn();
     aOutput.writeValue(0);
     aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current());
     aOutput.newLine();
 
     aOutput.nextColumn();
-    aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
+    aOutput.writeBoldString(ScResId(STR_VARIABLE_1_LABEL));
     aOutput.nextColumn();
-    aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
+    aOutput.writeBoldString(ScResId(STR_VARIABLE_2_LABEL));
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
+    aOutput.writeString(ScResId(STRID_CALC_MEAN));
     aOutput.nextColumn();
     aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -101,7 +101,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
-    aOutput.writeString(SC_RESSTR(STRID_CALC_VARIANCE));
+    aOutput.writeString(ScResId(STRID_CALC_VARIANCE));
     aOutput.nextColumn();
     aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -111,7 +111,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Observations
-    aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
+    aOutput.writeString(ScResId(STR_OBSERVATIONS_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -121,14 +121,14 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Pearson Correlation
-    aOutput.writeString(SC_RESSTR(STR_TTEST_PEARSON_CORRELATION));
+    aOutput.writeString(ScResId(STR_TTEST_PEARSON_CORRELATION));
     aOutput.nextColumn();
     aTemplate.setTemplate("=CORREL(%VARIABLE1_RANGE%;%VARIABLE2_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
     // Observed mean difference
-    aOutput.writeString(SC_RESSTR(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
+    aOutput.writeString(ScResId(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=AVERAGE(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))");
     aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -136,7 +136,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Variance of the Differences
-    aOutput.writeString(SC_RESSTR(STR_TTEST_VARIANCE_OF_THE_DIFFERENCES));
+    aOutput.writeString(ScResId(STR_TTEST_VARIANCE_OF_THE_DIFFERENCES));
     aOutput.nextColumn();
     aTemplate.setTemplate("=VAR(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))");
     aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -144,7 +144,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // df
-    aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_DF));
+    aOutput.writeString(ScResId(STR_ANOVA_LABEL_DF));
     aOutput.nextColumn();
     aTemplate.setTemplate("=SUM(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)) - 1");
     aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -152,7 +152,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // t stat
-    aOutput.writeString(SC_RESSTR(STR_TTEST_T_STAT));
+    aOutput.writeString(ScResId(STR_TTEST_T_STAT));
     aOutput.nextColumn();
     aTemplate.setTemplate("=(%OBSERVED_MEAN_DIFFERENCE% - %HYPOTHESIZED_MEAN_DIFFERENCE%) / (%VARIANCE_OF_DIFFERENCES% / ( %DEGREE_OF_FREEDOM% + 1)) ^ 0.5");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -160,28 +160,28 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // P one-tail
-    aOutput.writeString(SC_RESSTR(STR_TTEST_P_ONE_TAIL));
+    aOutput.writeString(ScResId(STR_TTEST_P_ONE_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=TDIST(ABS(%T_STAT%); %DEGREE_OF_FREEDOM%; 1)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
     // T critical one-tail
-    aOutput.writeString(SC_RESSTR(STR_TTEST_T_CRITICAL_ONE_TAIL));
+    aOutput.writeString(ScResId(STR_TTEST_T_CRITICAL_ONE_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=TINV(2*%ALPHA%; %DEGREE_OF_FREEDOM%)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
     // P two-tail
-    aOutput.writeString(SC_RESSTR(STR_TTEST_P_TWO_TAIL));
+    aOutput.writeString(ScResId(STR_TTEST_P_TWO_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=TDIST(ABS(%T_STAT%); %DEGREE_OF_FREEDOM%; 2)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
     // T critical two-tail
-    aOutput.writeString(SC_RESSTR(STR_TTEST_T_CRITICAL_TWO_TAIL));
+    aOutput.writeString(ScResId(STR_TTEST_T_CRITICAL_TWO_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=TINV(%ALPHA%; %DEGREE_OF_FREEDOM%)");
     aOutput.writeFormula(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index 91460d3778c7..b7a3f67ebd71 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -32,7 +32,7 @@ ScZTestDialog::ScZTestDialog(
             pSfxBindings, pChildWindow, pParent, pViewData,
             "ZTestDialog", "modules/scalc/ui/ztestdialog.ui" )
 {
-    SetText(SC_RESSTR(STR_ZTEST));
+    SetText(ScResId(STR_ZTEST));
 }
 
 ScZTestDialog::~ScZTestDialog()
@@ -69,18 +69,18 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
     aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
 
-    aOutput.writeBoldString(SC_RESSTR(STR_ZTEST));
+    aOutput.writeBoldString(ScResId(STR_ZTEST));
     aOutput.newLine();
 
     // Alpha
-    aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
+    aOutput.writeString(ScResId(STR_LABEL_ALPHA));
     aOutput.nextColumn();
     aOutput.writeValue(0.05);
     aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
     aOutput.newLine();
 
     // Hypothesized mean difference
-    aOutput.writeString(SC_RESSTR(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
+    aOutput.writeString(ScResId(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
     aOutput.nextColumn();
     aOutput.writeValue(0);
     aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current());
@@ -88,13 +88,13 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
 
     // Variable Label
     aOutput.nextColumn();
-    aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
+    aOutput.writeBoldString(ScResId(STR_VARIABLE_1_LABEL));
     aOutput.nextColumn();
-    aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
+    aOutput.writeBoldString(ScResId(STR_VARIABLE_2_LABEL));
     aOutput.newLine();
 
     // Known Variance
-    aOutput.writeString(SC_RESSTR(STR_ZTEST_KNOWN_VARIANCE));
+    aOutput.writeString(ScResId(STR_ZTEST_KNOWN_VARIANCE));
     aOutput.nextColumn();
     aOutput.writeValue(0);
     aTemplate.autoReplaceAddress("%KNOWN_VARIANCE_VARIABLE1%", aOutput.current());
@@ -104,7 +104,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Mean
-    aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
+    aOutput.writeString(ScResId(STRID_CALC_MEAN));
     aOutput.nextColumn();
     aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
     aTemplate.autoReplaceAddress("%MEAN_VARIABLE1%", aOutput.current());
@@ -116,7 +116,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Observations
-    aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
+    aOutput.writeString(ScResId(STR_OBSERVATIONS_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -128,7 +128,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Observed mean difference
-    aOutput.writeString(SC_RESSTR(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
+    aOutput.writeString(ScResId(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=%MEAN_VARIABLE1% - %MEAN_VARIABLE2%");
     aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -136,7 +136,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // z
-    aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_VALUE));
+    aOutput.writeString(ScResId(STR_ZTEST_Z_VALUE));
     aOutput.nextColumn();
     aTemplate.setTemplate("=(%OBSERVED_MEAN_DIFFERENCE% - %HYPOTHESIZED_MEAN_DIFFERENCE%) / SQRT( %KNOWN_VARIANCE_VARIABLE1% / %OBSERVATION_VARIABLE1% + %KNOWN_VARIANCE_VARIABLE2% / %OBSERVATION_VARIABLE2% )");
     aOutput.writeFormula(aTemplate.getTemplate());
@@ -144,28 +144,28 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // P one-tail
-    aOutput.writeString(SC_RESSTR(STR_ZTEST_P_ONE_TAIL));
+    aOutput.writeString(ScResId(STR_ZTEST_P_ONE_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=1 - NORMSDIST(ABS(%Z_STAT%))");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
     // z critical one-tail
-    aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_CRITICAL_ONE_TAIL));
+    aOutput.writeString(ScResId(STR_ZTEST_Z_CRITICAL_ONE_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=-NORMSINV(%ALPHA%)");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
     // P two-tail
-    aOutput.writeString(SC_RESSTR(STR_ZTEST_P_TWO_TAIL));
+    aOutput.writeString(ScResId(STR_ZTEST_P_TWO_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=2 * NORMSDIST(-ABS(%Z_STAT%))");
     aOutput.writeFormula(aTemplate.getTemplate());
     aOutput.newLine();
 
     // z critical two-tail
-    aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_CRITICAL_TWO_TAIL));
+    aOutput.writeString(ScResId(STR_ZTEST_Z_CRITICAL_TWO_TAIL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=-NORMSINV(%ALPHA%/2)");
     aOutput.writeFormula(aTemplate.getTemplate());