migrate to boost::gettext

* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
  MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
  goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
  to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
  mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
  results in inserting the english original so something can be found, now the
  standard fallback of using the english original from the source key is used, so
  partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
   xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
   xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
   content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
      com::sun::star::resource::OfficeResourceLoader
      com::sun::star::resource::XResourceBundleLoader
      com::sun::star::resource::XResourceBundle
    when translating strings via uno apis
      com.sun.star.resource.StringResourceWithLocation
    can continue to be used

Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a

15 files changed, 44 insertions, 521 deletions

diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 4c62091840f8..2b44b67061aa 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -22,29 +22,29 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "AnalysisOfVarianceDialog.hxx"
+#include "strings.hrc"
 
 namespace
 {
 
 struct StatisticCalculation {
-    sal_Int16   aLabelId;
+    const char* aLabelId;
     const char* aFormula;
     const char* aResultRangeName;
 };
 
 static StatisticCalculation lclBasicStatistics[] =
 {
-    { STR_ANOVA_LABEL_GROUPS, nullptr,                nullptr          },
+    { STR_ANOVA_LABEL_GROUPS, nullptr,             nullptr       },
     { STRID_CALC_COUNT,       "=COUNT(%RANGE%)",   "COUNT_RANGE" },
     { STRID_CALC_SUM,         "=SUM(%RANGE%)",     "SUM_RANGE"   },
     { STRID_CALC_MEAN,        "=AVERAGE(%RANGE%)", "MEAN_RANGE"  },
     { STRID_CALC_VARIANCE,    "=VAR(%RANGE%)",     "VAR_RANGE"   },
-    { 0,                      nullptr,                nullptr          }
+    { nullptr,                nullptr,             nullptr       }
 };
 
-static sal_Int16 lclAnovaLabels[] =
+static const char* lclAnovaLabels[] =
 {
     STR_ANOVA_LABEL_SOURCE_OF_VARIATION,
     STR_ANOVA_LABEL_SS,
@@ -53,7 +53,7 @@ static sal_Int16 lclAnovaLabels[] =
     STR_ANOVA_LABEL_F,
     STR_ANOVA_LABEL_P_VALUE,
     STR_ANOVA_LABEL_F_CRITICAL,
-    0
+    nullptr
 };
 
 static const char strWildcardRange[] = "%RANGE%";
@@ -133,7 +133,7 @@ bool ScAnalysisOfVarianceDialog::Close()
     return DoClose( ScAnalysisOfVarianceDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScAnalysisOfVarianceDialog::GetUndoNameId()
+const char* ScAnalysisOfVarianceDialog::GetUndoNameId()
 {
     return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME;
 }
@@ -181,8 +181,8 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke
     }
     else
     {
-        sal_Int16 aLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE;
-        OUString aLabelTemplate(ScResId(aLabelId));
+        const char* pLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE;
+        OUString aLabelTemplate(ScResId(pLabelId));
 
         for (size_t i = 0; i < rRangeList.size(); i++)
         {
@@ -210,7 +210,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     output.newLine();
 
     // Write labels
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.writeString(ScResId(lclBasicStatistics[i].aLabelId));
         output.nextColumn();
@@ -224,7 +224,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
     output.push();
 
     // Write values
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.resetRow();
         ScRange aResultRange;
@@ -242,7 +242,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
 
     // Write ANOVA labels
     output.resetColumn();
-    for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
+    for(sal_Int32 i = 0; lclAnovaLabels[i]; i++)
     {
         output.writeString(ScResId(lclAnovaLabels[i]));
         output.nextColumn();
@@ -358,7 +358,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
     output.newLine();
 
     // Write labels
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.writeString(ScResId(lclBasicStatistics[i].aLabelId));
         output.nextColumn();
@@ -373,7 +373,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
 
     // Write ColumnX values
     output.push();
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.resetRow();
         ScRange aResultRange;
@@ -390,7 +390,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
 
     // Write RowX values
     output.push();
-    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
+    for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId; i++)
     {
         output.resetRow();
         ScRange aResultRange;
@@ -407,7 +407,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
     output.newLine();
 
     // Write ANOVA labels
-    for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
+    for(sal_Int32 i = 0; lclAnovaLabels[i]; i++)
     {
         output.writeString(ScResId(lclAnovaLabels[i]));
         output.nextColumn();
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index 1a7591a121e1..96b2fffac7c8 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -21,8 +21,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "ChiSquareTestDialog.hxx"
+#include "strings.hrc"
 
 ScChiSquareTestDialog::ScChiSquareTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -42,7 +42,7 @@ bool ScChiSquareTestDialog::Close()
     return DoClose(ScChiSquareTestDialogWrapper::GetChildWindowId());
 }
 
-sal_Int16 ScChiSquareTestDialog::GetUndoNameId()
+const char* ScChiSquareTestDialog::GetUndoNameId()
 {
     return STR_CHI_SQUARE_TEST;
 }
diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
index 7eafe239aa40..446bf8a5e14e 100644
--- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
@@ -10,8 +10,8 @@
 
 #include "docsh.hxx"
 #include "reffact.hxx"
-
 #include "CorrelationDialog.hxx"
+#include "strings.hrc"
 
 ScCorrelationDialog::ScCorrelationDialog(
                         SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index 5506444bfd41..c4cfff7b1501 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -10,8 +10,8 @@
 
 #include "docsh.hxx"
 #include "reffact.hxx"
-
 #include "CovarianceDialog.hxx"
+#include "strings.hrc"
 
 ScCovarianceDialog::ScCovarianceDialog(
                         SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -21,7 +21,7 @@ ScCovarianceDialog::ScCovarianceDialog(
             "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" )
 {}
 
-sal_Int16 ScCovarianceDialog::GetUndoNameId()
+const char* ScCovarianceDialog::GetUndoNameId()
 {
     return STR_COVARIANCE_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 2dcc463a840e..38c412f5da09 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -22,14 +22,14 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "DescriptiveStatisticsDialog.hxx"
+#include "strings.hrc"
 
 namespace
 {
 
 struct StatisticCalculation {
-    sal_Int16   aCalculationNameId;
+    const char* aCalculationNameId;
     const char* aFormula;
 };
 
@@ -50,7 +50,7 @@ static const StatisticCalculation lclCalcDefinitions[] =
     { STRID_CALC_MAX,            "=MAX(%RANGE%)"},
     { STRID_CALC_SUM,            "=SUM(%RANGE%)"},
     { STRID_CALC_COUNT,          "=COUNT(%RANGE%)" },
-    { 0,                         nullptr }
+    { nullptr,                   nullptr }
 };
 
 }
@@ -71,7 +71,7 @@ bool ScDescriptiveStatisticsDialog::Close()
     return DoClose( ScDescriptiveStatisticsDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScDescriptiveStatisticsDialog::GetUndoNameId()
+const char* ScDescriptiveStatisticsDialog::GetUndoNameId()
 {
     return STR_DESCRIPTIVE_STATISTICS_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
index f5d679c3d339..2bad4e9e702a 100644
--- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "ExponentialSmoothingDialog.hxx"
+#include "strings.hrc"
 
 ScExponentialSmoothingDialog::ScExponentialSmoothingDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -51,7 +51,7 @@ bool ScExponentialSmoothingDialog::Close()
     return DoClose( ScExponentialSmoothingDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScExponentialSmoothingDialog::GetUndoNameId()
+const char* ScExponentialSmoothingDialog::GetUndoNameId()
 {
     return STR_EXPONENTIAL_SMOOTHING_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index a3cc2cb8b2b1..7461cec85d0c 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "FTestDialog.hxx"
+#include "strings.hrc"
 
 ScFTestDialog::ScFTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -43,7 +43,7 @@ bool ScFTestDialog::Close()
     return DoClose( ScFTestDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScFTestDialog::GetUndoNameId()
+const char* ScFTestDialog::GetUndoNameId()
 {
     return STR_FTEST_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 5d02286c98e9..984740e178c2 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -21,8 +21,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "MatrixComparisonGenerator.hxx"
+#include "strings.hrc"
 
 namespace
 {
@@ -59,7 +59,7 @@ ScMatrixComparisonGenerator::ScMatrixComparisonGenerator(
 ScMatrixComparisonGenerator::~ScMatrixComparisonGenerator()
 {}
 
-sal_Int16 ScMatrixComparisonGenerator::GetUndoNameId()
+const char* ScMatrixComparisonGenerator::GetUndoNameId()
 {
     return STR_CORRELATION_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
index 540dd33e721c..af892c2bee43 100644
--- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "MovingAverageDialog.hxx"
+#include "strings.hrc"
 
 ScMovingAverageDialog::ScMovingAverageDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -51,7 +51,7 @@ bool ScMovingAverageDialog::Close()
     return DoClose( ScMovingAverageDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScMovingAverageDialog::GetUndoNameId()
+const char* ScMovingAverageDialog::GetUndoNameId()
 {
     return STR_MOVING_AVERAGE_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 1c6e40b5a60a..af5431197000 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -20,6 +20,7 @@
 #include "uiitems.hxx"
 #include "reffact.hxx"
 #include "docfunc.hxx"
+#include "strings.hrc"
 
 #include <random>
 
@@ -279,10 +280,10 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
 }
 
 template<class RNG>
-void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, boost::optional<sal_Int8> aDecimalPlaces)
+void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const char* pDistributionStringId, boost::optional<sal_Int8> aDecimalPlaces)
 {
     OUString aUndo = ScResId(STR_UNDO_DISTRIBUTION_TEMPLATE);
-    OUString aDistributionName = ScResId(aDistributionStringId);
+    OUString aDistributionName = ScResId(pDistributionStringId);
     aUndo = aUndo.replaceAll("$(DISTRIBUTION)",  aDistributionName);
 
     ScDocShell* pDocShell = mpViewData->GetDocShell();
diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
index 6950c8dea61f..1438548cd007 100644
--- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
@@ -22,12 +22,12 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "RegressionDialog.hxx"
+#include "strings.hrc"
 
 namespace
 {
-    sal_Int16 constRegressionModel[] =
+    const char* constRegressionModel[] =
     {
         STR_LABEL_LINEAR,
         STR_LABEL_LOGARITHMIC,
@@ -101,7 +101,7 @@ void ScRegressionDialog::dispose()
     ScStatisticsTwoVariableDialog::dispose();
 }
 
-sal_Int16 ScRegressionDialog::GetUndoNameId()
+const char* ScRegressionDialog::GetUndoNameId()
 {
     return STR_REGRESSION_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 7f683556bb65..a8f3a2a77fe1 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -19,8 +19,8 @@
 #include "uiitems.hxx"
 #include "reffact.hxx"
 #include "docfunc.hxx"
-
 #include "SamplingDialog.hxx"
+#include "strings.hrc"
 
 ScSamplingDialog::ScSamplingDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
deleted file mode 100644
index 3289f306a246..000000000000
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
+++ /dev/null
@@ -1,478 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- */
-
-#include "scres.hrc"
-
-/* MovingAverageDialog */
-
-String STR_MOVING_AVERAGE_UNDO_NAME
-{
-    Text [ en-US ] = "Moving Average";
-};
-
-/* ExponentialSmoothingDialog */
-
-String STR_EXPONENTIAL_SMOOTHING_UNDO_NAME
-{
-    Text [ en-US ] = "Exponential Smoothing";
-};
-
-/* AnalysisOfVarianceDialog */
-
-String STR_ANALYSIS_OF_VARIANCE_UNDO_NAME
-{
-    Text [ en-US ] = "Analysis of Variance";
-};
-
-String STR_ANOVA_SINGLE_FACTOR_LABEL
-{
-    Text [ en-US ] = "ANOVA - Single Factor";
-};
-
-String STR_ANOVA_TWO_FACTOR_LABEL
-{
-    Text [ en-US ] = "ANOVA - Two Factor";
-};
-
-String STR_ANOVA_LABEL_GROUPS
-{
-    Text [ en-US ] = "Groups";
-};
-
-String STR_ANOVA_LABEL_BETWEEN_GROUPS
-{
-    Text [ en-US ] = "Between Groups";
-};
-
-String STR_ANOVA_LABEL_WITHIN_GROUPS
-{
-    Text [ en-US ] = "Within Groups";
-};
-
-String STR_ANOVA_LABEL_SOURCE_OF_VARIATION
-{
-    Text [ en-US ] = "Source of Variation";
-};
-
-String STR_ANOVA_LABEL_SS
-{
-    Text [ en-US ] = "SS";
-};
-
-String STR_ANOVA_LABEL_DF
-{
-    Text [ en-US ] = "df";
-};
-
-String STR_ANOVA_LABEL_MS
-{
-    Text [ en-US ] = "MS";
-};
-
-String STR_ANOVA_LABEL_F
-{
-    Text [ en-US ] = "F";
-};
-
-String STR_ANOVA_LABEL_P_VALUE
-{
-    Text [ en-US ] = "P-value";
-};
-
-String STR_ANOVA_LABEL_F_CRITICAL
-{
-    Text [ en-US ] = "F critical";
-};
-
-String STR_ANOVA_LABEL_TOTAL
-{
-    Text [ en-US ] = "Total";
-};
-
-/* CorrelationDialog */
-
-String STR_CORRELATION_UNDO_NAME
-{
-    Text [ en-US ] = "Correlation";
-};
-
-String STR_CORRELATION_LABEL
-{
-    Text [ en-US ] = "Correlations";
-};
-
-/* CovarianceDialog */
-
-String STR_COVARIANCE_UNDO_NAME
-{
-    Text [ en-US ] = "Covariance";
-};
-
-String STR_COVARIANCE_LABEL
-{
-    Text [ en-US ] = "Covariances";
-};
-
-/* DescriptiveStatisticsDialog */
-
-String STR_DESCRIPTIVE_STATISTICS_UNDO_NAME
-{
-    Text [ en-US ] = "Descriptive Statistics";
-};
-String STRID_CALC_MEAN
-{
-    Text [ en-US ] = "Mean";
-};
-String STRID_CALC_STD_ERROR
-{
-    Text [ en-US ] = "Standard Error";
-};
-String STRID_CALC_MODE
-{
-    Text [ en-US ] = "Mode";
-};
-String STRID_CALC_MEDIAN
-{
-    Text [ en-US ] = "Median";
-};
-String STRID_CALC_VARIANCE
-{
-    Text [ en-US ] = "Variance";
-};
-String STRID_CALC_STD_DEVIATION
-{
-    Text [ en-US ] = "Standard Deviation";
-};
-String STRID_CALC_KURTOSIS
-{
-    Text [ en-US ] = "Kurtosis";
-};
-String STRID_CALC_SKEWNESS
-{
-    Text [ en-US ] = "Skewness";
-};
-String STRID_CALC_RANGE
-{
-    Text [ en-US ] = "Range";
-};
-String STRID_CALC_MIN
-{
-    Text [ en-US ] = "Minimum";
-};
-String STRID_CALC_MAX
-{
-    Text [ en-US ] = "Maximum";
-};
-String STRID_CALC_SUM
-{
-    Text [ en-US ] = "Sum";
-};
-String STRID_CALC_COUNT
-{
-    Text [ en-US ] = "Count";
-};
-String STRID_CALC_FIRST_QUARTILE
-{
-    Text [ en-US ] = "First Quartile ";
-};
-String STRID_CALC_THIRD_QUARTILE
-{
-    Text [ en-US ] = "Third Quartile";
-};
-
-/* RandomNumberGeneratorDialog */
-
-String STR_UNDO_DISTRIBUTION_TEMPLATE
-{
-    Text [ en-US ] = "Random ($(DISTRIBUTION))";
-};
-String STR_DISTRIBUTION_UNIFORM_REAL
-{
-    Text [ en-US ] = "Uniform";
-};
-String STR_DISTRIBUTION_UNIFORM_INTEGER
-{
-    Text [ en-US ] = "Uniform Integer";
-};
-String STR_DISTRIBUTION_NORMAL
-{
-    Text [ en-US ] = "Normal";
-};
-String STR_DISTRIBUTION_CAUCHY
-{
-    Text [ en-US ] = "Cauchy";
-};
-String STR_DISTRIBUTION_BERNOULLI
-{
-    Text [ en-US ] = "Bernoulli";
-};
-String STR_DISTRIBUTION_BINOMIAL
-{
-    Text [ en-US ] = "Binomial";
-};
-String STR_DISTRIBUTION_NEGATIVE_BINOMIAL
-{
-    Text [ en-US ] = "Negative Binomial";
-};
-String STR_DISTRIBUTION_CHI_SQUARED
-{
-    Text [ en-US ] = "Chi Squared";
-};
-String STR_DISTRIBUTION_GEOMETRIC
-{
-    Text [ en-US ] = "Geometric";
-};
-String STR_RNG_PARAMETER_MINIMUM
-{
-    Text [ en-US ] = "Minimum";
-};
-String STR_RNG_PARAMETER_MAXIMUM
-{
-    Text [ en-US ] = "Maximum";
-};
-String STR_RNG_PARAMETER_MEAN
-{
-    Text [ en-US ] = "Mean";
-};
-String STR_RNG_PARAMETER_STANDARD_DEVIATION
-{
-    Text [ en-US ] = "Standard Deviation";
-};
-String STR_RNG_PARAMETER_STANDARD_MEDIAN
-{
-    Text [ en-US ] = "Median";
-};
-String STR_RNG_PARAMETER_STANDARD_SIGMA
-{
-    Text [ en-US ] = "Sigma";
-};
-String STR_RNG_PARAMETER_STANDARD_PROBABILITY
-{
-    Text [ en-US ] = "p Value";
-};
-String STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS
-{
-    Text [ en-US ] = "Number of Trials";
-};
-String STR_RNG_PARAMETER_STANDARD_NU_VALUE
-{
-    Text [ en-US ] = "nu Value";
-};
-
-/* SamplingDialog */
-
-String STR_SAMPLING_UNDO_NAME
-{
-    Text [ en-US ] = "Sampling";
-};
-
-/* Names of dialogs */
-String STR_FTEST
-{
-    Text [ en-US ] = "F-test";
-};
-String STR_FTEST_UNDO_NAME
-{
-    Text [ en-US ] = "F-test";
-};
-String STR_TTEST
-{
-    Text [ en-US ] = "t-test";
-};
-String STR_TTEST_UNDO_NAME
-{
-    Text [ en-US ] = "t-test";
-};
-String STR_ZTEST
-{
-    Text [ en-US ] = "z-test";
-};
-String STR_ZTEST_UNDO_NAME
-{
-    Text [ en-US ] = "z-test";
-};
-String STR_CHI_SQUARE_TEST
-{
-    Text [ en-US ] = "Test of Independence (Chi-Square)";
-};
-String STR_REGRESSION_UNDO_NAME
-{
-    Text [ en-US ] = "Regression";
-};
-String STR_REGRESSION
-{
-    Text [ en-US ] = "Regression";
-};
-
-/* Common */
-String STR_COLUMN_LABEL_TEMPLATE
-{
-    Text [ en-US ] = "Column %NUMBER%";
-};
-String STR_ROW_LABEL_TEMPLATE
-{
-    Text [ en-US ] = "Row %NUMBER%";
-};
-String STR_LABEL_ALPHA
-{
-    Text [ en-US ] = "Alpha";
-};
-String STR_VARIABLE_1_LABEL
-{
-    Text [ en-US ] = "Variable 1";
-};
-String STR_VARIABLE_2_LABEL
-{
-    Text [ en-US ] = "Variable 2";
-};
-String STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL
-{
-    Text [ en-US ] = "Hypothesized Mean Difference";
-};
-String STR_OBSERVATIONS_LABEL
-{
-    Text [ en-US ] = "Observations";
-};
-String STR_OBSERVED_MEAN_DIFFERENCE_LABEL
-{
-    Text [ en-US ] = "Observed Mean Difference";
-};
-String STR_DEGREES_OF_FREEDOM_LABEL
-{
-    Text [ en-US ] = "df";
-};
-String STR_P_VALUE_LABEL
-{
-    Text [ en-US ] = "P-value";
-};
-String STR_CRITICAL_VALUE_LABEL
-{
-    Text [ en-US ] = "Critical Value";
-};
-String STR_TEST_STATISTIC_LABEL
-{
-    Text [ en-US ] = "Test Statistic";
-};
-
-/* RegressionDialog */
-
-String STR_LABEL_LINEAR
-{
-    Text [ en-US ] = "Linear";
-};
-String STR_LABEL_LOGARITHMIC
-{
-    Text [ en-US ] = "Logarithmic";
-};
-String STR_LABEL_POWER
-{
-    Text [ en-US ] = "Power";
-};
-
-String STR_LABEL_REGRESSION_MODEL
-{
-    Text [ en-US ] = "Regression Model";
-};
-String STR_LABEL_RSQUARED
-{
-    Text [ en-US ] = "R^2";
-};
-String STR_LABEL_SLOPE
-{
-    Text [ en-US ] = "Slope";
-};
-String STR_LABEL_INTERCEPT
-{
-    Text [ en-US ] = "Intercept";
-};
-
-/*F Test */
-String STR_FTEST_P_RIGHT_TAIL
-{
-    Text [ en-US ] = "P (F<=f) right-tail";
-};
-String STR_FTEST_F_CRITICAL_RIGHT_TAIL
-{
-    Text [ en-US ] = "F Critical right-tail";
-};
-String STR_FTEST_P_LEFT_TAIL
-{
-    Text [ en-US ] = "P (F<=f) left-tail";
-};
-String STR_FTEST_F_CRITICAL_LEFT_TAIL
-{
-    Text [ en-US ] = "F Critical left-tail";
-};
-String STR_FTEST_P_TWO_TAIL
-{
-    Text [ en-US ] = "P two-tail";
-};
-String STR_FTEST_F_CRITICAL_TWO_TAIL
-{
-    Text [ en-US ] = "F Critical two-tail";
-};
-
-/*t Test*/
-String STR_TTEST_PEARSON_CORRELATION
-{
-    Text [ en-US ] = "Pearson Correlation";
-};
-String STR_TTEST_VARIANCE_OF_THE_DIFFERENCES
-{
-    Text [ en-US ] = "Variance of the Differences";
-};
-String STR_TTEST_T_STAT
-{
-    Text [ en-US ] = "t Stat";
-};
-String STR_TTEST_P_ONE_TAIL
-{
-    Text [ en-US ] = "P (T<=t) one-tail";
-};
-String STR_TTEST_T_CRITICAL_ONE_TAIL
-{
-    Text [ en-US ] = "t Critical one-tail";
-};
-String STR_TTEST_P_TWO_TAIL
-{
-    Text [ en-US ] = "P (T<=t) two-tail";
-};
-String STR_TTEST_T_CRITICAL_TWO_TAIL
-{
-    Text [ en-US ] = "t Critical two-tail";
-};
-
-/*Z Test*/
-String STR_ZTEST_Z_VALUE
-{
-    Text [ en-US ] = "z";
-};
-String STR_ZTEST_KNOWN_VARIANCE
-{
-    Text [ en-US ] = "Known Variance";
-};
-String STR_ZTEST_P_ONE_TAIL
-{
-    Text [ en-US ] = "P (Z<=z) one-tail";
-};
-String STR_ZTEST_Z_CRITICAL_ONE_TAIL
-{
-    Text [ en-US ] = "z Critical one-tail";
-};
-String STR_ZTEST_P_TWO_TAIL
-{
-    Text [ en-US ] = "P (Z<=z) two-tail";
-};
-String STR_ZTEST_Z_CRITICAL_TWO_TAIL
-{
-    Text [ en-US ] = "z Critical two-tail";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index a94c82943dd6..46f3cd226170 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "TTestDialog.hxx"
+#include "strings.hrc"
 
 ScTTestDialog::ScTTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -43,7 +43,7 @@ bool ScTTestDialog::Close()
     return DoClose( ScTTestDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScTTestDialog::GetUndoNameId()
+const char* ScTTestDialog::GetUndoNameId()
 {
     return STR_TTEST_UNDO_NAME;
 }
diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index b7a3f67ebd71..475a5f705f2a 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -22,8 +22,8 @@
 #include "reffact.hxx"
 #include "docfunc.hxx"
 #include "TableFillingAndNavigationTools.hxx"
-
 #include "ZTestDialog.hxx"
+#include "strings.hrc"
 
 ScZTestDialog::ScZTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -43,7 +43,7 @@ bool ScZTestDialog::Close()
     return DoClose( ScZTestDialogWrapper::GetChildWindowId() );
 }
 
-sal_Int16 ScZTestDialog::GetUndoNameId()
+const char* ScZTestDialog::GetUndoNameId()
 {
     return STR_ZTEST_UNDO_NAME;
 }