moved StatisticsDialogs string IDs from globstr to RID_STATISTICS_DLGS

They aren't needed in globstr and weren't in RID_GLOBSTR anyway but in
global STR_START+... range possibly sharing IDs with something else
after STR_END of sc.hrc ...

Change-Id: I1f9f8e9e1748afdd00ceb3106ec405456415ee21

sc/AllLangResTarget_sc.mk

@@ -78,12 +78,7 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
     sc/source/ui/formdlg/formdlgs.src \
     sc/source/ui/formdlg/dwfunctr.src \
     sc/source/ui/sidebar/CellAppearancePropertyPanel.src \
-    sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.src \
-    sc/source/ui/StatisticsDialogs/SamplingDialog.src \
-    sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.src \
-    sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.src \
-    sc/source/ui/StatisticsDialogs/CorrelationDialog.src \
-    sc/source/ui/StatisticsDialogs/CovarianceDialog.src \
+    sc/source/ui/StatisticsDialogs/StatisticsDialogs.src \
     sc/source/core/src/compiler.src \
 ))
 

sc/inc/globstr.hrc

@@ -690,47 +690,6 @@
 
 #define STR_COUNT                   553
 
-#define STR_UNDO_DISTRIBUTION_TEMPLATE      554
-#define STR_DISTRIBUTION_UNIFORM_REAL       555
-#define STR_DISTRIBUTION_UNIFORM_INTEGER    556
-#define STR_DISTRIBUTION_NORMAL             557
-#define STR_DISTRIBUTION_CAUCHY             558
-#define STR_DISTRIBUTION_BERNOULLI          559
-#define STR_DISTRIBUTION_BINOMIAL           560
-#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL  561
-#define STR_DISTRIBUTION_CHI_SQUARED        562
-#define STR_DISTRIBUTION_GEOMETRIC          563
-
-#define STR_RNG_PARAMETER_MINIMUM                   564
-#define STR_RNG_PARAMETER_MAXIMUM                   565
-#define STR_RNG_PARAMETER_MEAN                      566
-#define STR_RNG_PARAMETER_STANDARD_DEVIATION        567
-#define STR_RNG_PARAMETER_STANDARD_MEDIAN           568
-#define STR_RNG_PARAMETER_STANDARD_SIGMA            569
-#define STR_RNG_PARAMETER_STANDARD_PROBABILITY      570
-#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS 571
-#define STR_RNG_PARAMETER_STANDARD_NU_VALUE         572
-
-#define STR_SAMPLING_UNDO_NAME  573
-
-#define SID_CALC_MEAN           574
-#define SID_CALC_STD_ERROR      575
-#define SID_CALC_MODE           576
-#define SID_CALC_MEDIAN         577
-#define SID_CALC_VARIANCE       578
-#define SID_CALC_STD_DEVIATION  579
-#define SID_CALC_KURTOSIS       580
-#define SID_CALC_SKEWNESS       581
-#define SID_CALC_RANGE          582
-#define SID_CALC_MIN            583
-#define SID_CALC_MAX            584
-#define SID_CALC_SUM            585
-#define SID_CALC_COUNT          586
-
-#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME    587
-#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME      588
-#define STR_CORRELATION_UNDO_NAME               589
-#define STR_COVARIANCE_UNDO_NAME                590
 
 // Row fillers
 #define STR_VALERR              591

sc/inc/sc.hrc

@@ -711,6 +711,7 @@
 #define RID_POPUP_MEDIA         (SC_RESOURCE_START+61)
 #define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62)
 #define RID_MN_INSERT_FIELDS    (SC_RESOURCE_START+63)
+#define RID_STATISTICS_DLGS     (SC_RESOURCE_START+64)
 
 #define STR_START               (SC_RESOURCE_START+100)
 #define STR_ROWHEIGHT           (STR_START)

sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx

@@ -19,11 +19,10 @@
 #include "document.hxx"
 #include "uiitems.hxx"
 #include "reffact.hxx"
-#include "scresid.hxx"
+#include "strload.hxx"
 #include "random.hxx"
 #include "docfunc.hxx"
-#include "globstr.hrc"
-#include "sc.hrc"
+#include "StatisticsDialogs.hrc"
 
 #include "AnalysisOfVarianceDialog.hxx"
 
@@ -89,7 +88,7 @@ sal_Bool ScAnalysisOfVarianceDialog::Close()
 
 void ScAnalysisOfVarianceDialog::CalculateInputAndWriteToOutput( )
 {
-    OUString aUndo(SC_RESSTR(STR_ANALYSIS_OF_VARIANCE_UNDO_NAME));
+    OUString aUndo( SC_STRLOAD( RID_STATISTICS_DLGS, STR_ANALYSIS_OF_VARIANCE_UNDO_NAME));
 
     ScDocShell* pDocShell = mViewData->GetDocShell();
     svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();

sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.src

-/* -*- 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 "globstr.hrc"
-
-String STR_ANALYSIS_OF_VARIANCE_UNDO_NAME
-{
-    Text [ en-US ] = "Analysis of Variance";
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx

@@ -19,11 +19,10 @@
 #include "document.hxx"
 #include "uiitems.hxx"
 #include "reffact.hxx"
-#include "scresid.hxx"
+#include "strload.hxx"
 #include "random.hxx"
 #include "docfunc.hxx"
-#include "globstr.hrc"
-#include "sc.hrc"
+#include "StatisticsDialogs.hrc"
 
 #include "CorrelationDialog.hxx"
 
@@ -56,7 +55,7 @@ sal_Bool ScCorrelationDialog::Close()
 
 void ScCorrelationDialog::CalculateInputAndWriteToOutput( )
 {
-    OUString aUndo(SC_RESSTR(STR_CORRELATION_UNDO_NAME));
+    OUString aUndo( SC_STRLOAD( RID_STATISTICS_DLGS, STR_CORRELATION_UNDO_NAME));
     ScDocShell* pDocShell = mViewData->GetDocShell();
     svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
     pUndoManager->EnterListAction( aUndo, aUndo );

sc/source/ui/StatisticsDialogs/CorrelationDialog.src

-/* -*- 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 "globstr.hrc"
-
-String STR_CORRELATION_UNDO_NAME
-{
-    Text [ en-US ] = "Correlation";
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx

@@ -19,11 +19,10 @@
 #include "document.hxx"
 #include "uiitems.hxx"
 #include "reffact.hxx"
-#include "scresid.hxx"
+#include "strload.hxx"
 #include "random.hxx"
 #include "docfunc.hxx"
-#include "globstr.hrc"
-#include "sc.hrc"
+#include "StatisticsDialogs.hrc"
 
 #include "CovarianceDialog.hxx"
 
@@ -56,7 +55,7 @@ sal_Bool ScCovarianceDialog::Close()
 
 void ScCovarianceDialog::CalculateInputAndWriteToOutput( )
 {
-    OUString aUndo(SC_RESSTR(STR_COVARIANCE_UNDO_NAME));
+    OUString aUndo( SC_STRLOAD( RID_STATISTICS_DLGS, STR_COVARIANCE_UNDO_NAME));
     ScDocShell* pDocShell = mViewData->GetDocShell();
     svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
     pUndoManager->EnterListAction( aUndo, aUndo );

sc/source/ui/StatisticsDialogs/CovarianceDialog.src

-/* -*- 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 "globstr.hrc"
-
-String STR_COVARIANCE_UNDO_NAME
-{
-    Text [ en-US ] = "Covariance";
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx

@@ -19,11 +19,10 @@
 #include "document.hxx"
 #include "uiitems.hxx"
 #include "reffact.hxx"
-#include "scresid.hxx"
+#include "strload.hxx"
 #include "random.hxx"
 #include "docfunc.hxx"
-#include "globstr.hrc"
-#include "sc.hrc"
+#include "StatisticsDialogs.hrc"
 
 #include <boost/random.hpp>
 

sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.src

-/* -*- 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 "globstr.hrc"
-
-String STR_DESCRIPTIVE_STATISTICS_UNDO_NAME
-{
-    Text [ en-US ] = "Descriptive Statistics";
-};
-
-String SID_CALC_MEAN
-{
-    Text [ en-US ] = "Mean";
-};
-
-String SID_CALC_STD_ERROR
-{
-    Text [ en-US ] = "Standard Error";
-};
-
-String SID_CALC_MODE
-{
-    Text [ en-US ] = "Mode";
-};
-
-String SID_CALC_MEDIAN
-{
-    Text [ en-US ] = "Median";
-};
-
-String SID_CALC_VARIANCE
-{
-    Text [ en-US ] = "Variance";
-};
-
-String SID_CALC_STD_DEVIATION
-{
-    Text [ en-US ] = "Standard Deviation";
-};
-
-String SID_CALC_KURTOSIS
-{
-    Text [ en-US ] = "Kurtosis";
-};
-
-String SID_CALC_SKEWNESS
-{
-    Text [ en-US ] = "Skewness";
-};
-
-String SID_CALC_RANGE
-{
-    Text [ en-US ] = "Range";
-};
-
-String SID_CALC_MIN
-{
-    Text [ en-US ] = "Minimum";
-};
-
-String SID_CALC_MAX
-{
-    Text [ en-US ] = "Maximum";
-};
-
-String SID_CALC_SUM
-{
-    Text [ en-US ] = "Sum";
-};
-
-String SID_CALC_COUNT
-{
-    Text [ en-US ] = "Count";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx

@@ -18,11 +18,10 @@
 #include "document.hxx"
 #include "uiitems.hxx"
 #include "reffact.hxx"
-#include "scresid.hxx"
+#include "strload.hxx"
 #include "random.hxx"
 #include "docfunc.hxx"
-#include "globstr.hrc"
-#include "sc.hrc"
+#include "StatisticsDialogs.hrc"
 
 #include <boost/random.hpp>
 #include <boost/random/uniform_real_distribution.hpp>
@@ -190,63 +189,63 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
         {
             boost::random::uniform_real_distribution<> distribution(parameter1, parameter2);
             boost::variate_generator<boost::mt19937&, boost::random::uniform_real_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_UNIFORM_REAL));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_UNIFORM_REAL));
             break;
         }
         case DIST_UNIFORM_INTEGER:
         {
             boost::random::uniform_int_distribution<> distribution(parameterInteger1, parameterInteger2);
             boost::variate_generator<boost::mt19937&, boost::random::uniform_int_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_UNIFORM_INTEGER));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_UNIFORM_INTEGER));
             break;
         }
         case DIST_NORMAL:
         {
             boost::random::normal_distribution<> distribution(parameter1, parameter2);
             boost::variate_generator<boost::mt19937&, boost::random::normal_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_NORMAL));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_NORMAL));
             break;
         }
         case DIST_CAUCHY:
         {
             boost::random::cauchy_distribution<> distribution(parameter1);
             boost::variate_generator<boost::mt19937&, boost::random::cauchy_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_CAUCHY));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_CAUCHY));
             break;
         }
         case DIST_BERNOULLI:
         {
             boost::random::bernoulli_distribution<> distribution(parameter1);
             boost::variate_generator<boost::mt19937&, boost::random::bernoulli_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_BERNOULLI));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_BERNOULLI));
             break;
         }
         case DIST_BINOMIAL:
         {
             boost::random::binomial_distribution<> distribution(parameterInteger2, parameter1);
             boost::variate_generator<boost::mt19937&, boost::random::binomial_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_BINOMIAL));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_BINOMIAL));
             break;
         }
         case DIST_NEGATIVE_BINOMIAL:
         {
             boost::random::negative_binomial_distribution<> distribution(parameterInteger2, parameter1);
             boost::variate_generator<boost::mt19937&, boost::random::negative_binomial_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_NEGATIVE_BINOMIAL));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_NEGATIVE_BINOMIAL));
             break;
         }
         case DIST_CHI_SQUARED:
         {
             boost::random::chi_squared_distribution<> distribution(parameter1);
             boost::variate_generator<boost::mt19937&, boost::random::chi_squared_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_CHI_SQUARED));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_CHI_SQUARED));
             break;
         }
         case DIST_GEOMETRIC:
         {
             boost::random::geometric_distribution<> distribution(parameter1);
             boost::variate_generator<boost::mt19937&, boost::random::geometric_distribution<> > rng(seed, distribution);
-            GenerateNumbers(rng, SC_RESSTR(STR_DISTRIBUTION_GEOMETRIC));
+            GenerateNumbers(rng, SC_STRLOAD( RID_STATISTICS_DLGS, STR_DISTRIBUTION_GEOMETRIC));
             break;
         }
     }
@@ -255,7 +254,7 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
 template<class RNG>
 void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG randomGenerator, OUString aDistributionName)
 {
-    OUString aUndo = SC_RESSTR(STR_UNDO_DISTRIBUTION_TEMPLATE);
+    OUString aUndo = SC_STRLOAD( RID_STATISTICS_DLGS, STR_UNDO_DISTRIBUTION_TEMPLATE);
     aUndo = aUndo.replaceAll("$(DISTRIBUTION)",  aDistributionName);
 
     ScDocShell* pDocShell = mViewData->GetDocShell();
@@ -384,19 +383,19 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged)
     {
         case DIST_UNIFORM:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MINIMUM));
-            mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MAXIMUM));
+            mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MINIMUM));
+            mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MAXIMUM));
             mpParameter2Text->Show();
             mpParameter2Value->Show();
             break;
         }
         case DIST_UNIFORM_INTEGER:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MINIMUM));
+            mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MINIMUM));
             mpParameter1Value->SetDecimalDigits(0);
             mpParameter1Value->SetSpinSize(1);
 
-            mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MAXIMUM));
+            mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MAXIMUM));
             mpParameter2Value->SetDecimalDigits(0);
             mpParameter2Value->SetSpinSize(1);
 
@@ -406,16 +405,16 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged)
         }
         case DIST_NORMAL:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MEAN));
-            mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_DEVIATION));
+            mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MEAN));
+            mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, 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( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_MEDIAN));
+            mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_SIGMA));
             mpParameter2Text->Show();
             mpParameter2Value->Show();
             break;
@@ -423,7 +422,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged)
         case DIST_BERNOULLI:
         case DIST_GEOMETRIC:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
+            mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_PROBABILITY));
             mpParameter1Value->SetMin(         0 );
             mpParameter1Value->SetMax( PERCISION );
             mpParameter1Value->SetSpinSize(1000);
@@ -435,12 +434,12 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged)
         case DIST_BINOMIAL:
         case DIST_NEGATIVE_BINOMIAL:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
+            mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, 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( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS));
             mpParameter2Value->SetDecimalDigits(0);
             mpParameter2Value->SetSpinSize(1);
             mpParameter2Value->SetMin(0);
@@ -451,7 +450,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged)
         }
         case DIST_CHI_SQUARED:
         {
-            mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_NU_VALUE));
+            mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_NU_VALUE));
 
             mpParameter2Text->Hide();
             mpParameter2Value->Hide();

sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.src

-/* -*- 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 "globstr.hrc"
-
-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 ] = "Geometric";
-};
-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";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/StatisticsDialogs/SamplingDialog.cxx

@@ -18,11 +18,10 @@
 #include "document.hxx"
 #include "uiitems.hxx"
 #include "reffact.hxx"
-#include "scresid.hxx"
+#include "strload.hxx"
 #include "random.hxx"
 #include "docfunc.hxx"
-#include "globstr.hrc"
-#include "sc.hrc"
+#include "StatisticsDialogs.hrc"
 
 #include <boost/random.hpp>
 
@@ -257,7 +256,7 @@ ScRange ScSamplingDialog::PerformRandomSampling(ScDocShell* pDocShell)
 
 void ScSamplingDialog::PerformSampling()
 {
-    OUString aUndo(SC_RESSTR(STR_SAMPLING_UNDO_NAME));
+    OUString aUndo( SC_STRLOAD( RID_STATISTICS_DLGS, STR_SAMPLING_UNDO_NAME));
     ScDocShell* pDocShell = mViewData->GetDocShell();
     svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
 

sc/source/ui/StatisticsDialogs/SamplingDialog.src

-/* -*- 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 "globstr.hrc"
-
-String STR_SAMPLING_UNDO_NAME
-{
-    Text [ en-US ] = "Sampling";
-};
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc

+/* -*- 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 "sc.hrc"
+
+#define STR_UNDO_DISTRIBUTION_TEMPLATE              1
+#define STR_DISTRIBUTION_UNIFORM_REAL               2
+#define STR_DISTRIBUTION_UNIFORM_INTEGER            3
+#define STR_DISTRIBUTION_NORMAL                     4
+#define STR_DISTRIBUTION_CAUCHY                     5
+#define STR_DISTRIBUTION_BERNOULLI                  6
+#define STR_DISTRIBUTION_BINOMIAL                   7
+#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL          8
+#define STR_DISTRIBUTION_CHI_SQUARED                9
+#define STR_DISTRIBUTION_GEOMETRIC                  10
+
+#define STR_RNG_PARAMETER_MINIMUM                   11
+#define STR_RNG_PARAMETER_MAXIMUM                   12
+#define STR_RNG_PARAMETER_MEAN                      13
+#define STR_RNG_PARAMETER_STANDARD_DEVIATION        14
+#define STR_RNG_PARAMETER_STANDARD_MEDIAN           15
+#define STR_RNG_PARAMETER_STANDARD_SIGMA            16
+#define STR_RNG_PARAMETER_STANDARD_PROBABILITY      17
+#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS 18
+#define STR_RNG_PARAMETER_STANDARD_NU_VALUE         19
+
+#define STR_SAMPLING_UNDO_NAME                      20
+
+#define SID_CALC_MEAN                               21
+#define SID_CALC_STD_ERROR                          22
+#define SID_CALC_MODE                               23
+#define SID_CALC_MEDIAN                             24
+#define SID_CALC_VARIANCE                           25
+#define SID_CALC_STD_DEVIATION                      26
+#define SID_CALC_KURTOSIS                           27
+#define SID_CALC_SKEWNESS                           28
+#define SID_CALC_RANGE                              29
+#define SID_CALC_MIN                                30
+#define SID_CALC_MAX                                31
+#define SID_CALC_SUM                                32
+#define SID_CALC_COUNT                              33
+
+#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME        34
+#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME          35
+#define STR_CORRELATION_UNDO_NAME                   36
+#define STR_COVARIANCE_UNDO_NAME                    37
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/StatisticsDialogs/StatisticsDialogs.src

+/* -*- 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 "StatisticsDialogs.hrc"
+
+Resource RID_STATISTICS_DLGS
+{
+
+    /* AnalysisOfVarianceDialog */
+
+    String STR_ANALYSIS_OF_VARIANCE_UNDO_NAME
+    {
+        Text [ en-US ] = "Analysis of Variance";
+    };
+
+    /* CorrelationDialog */
+
+    String STR_CORRELATION_UNDO_NAME
+    {
+        Text [ en-US ] = "Correlation";
+    };
+
+    /* CovarianceDialog */
+
+    String STR_COVARIANCE_UNDO_NAME
+    {
+        Text [ en-US ] = "Covariance";
+    };
+
+    /* DescriptiveStatisticsDialog */
+
+    String STR_DESCRIPTIVE_STATISTICS_UNDO_NAME
+    {
+        Text [ en-US ] = "Descriptive Statistics";
+    };
+    String SID_CALC_MEAN
+    {
+        Text [ en-US ] = "Mean";
+    };
+    String SID_CALC_STD_ERROR
+    {
+        Text [ en-US ] = "Standard Error";
+    };
+    String SID_CALC_MODE
+    {
+        Text [ en-US ] = "Mode";
+    };
+    String SID_CALC_MEDIAN
+    {
+        Text [ en-US ] = "Median";
+    };
+    String SID_CALC_VARIANCE
+    {
+        Text [ en-US ] = "Variance";
+    };
+    String SID_CALC_STD_DEVIATION
+    {
+        Text [ en-US ] = "Standard Deviation";
+    };
+    String SID_CALC_KURTOSIS
+    {
+        Text [ en-US ] = "Kurtosis";
+    };
+    String SID_CALC_SKEWNESS
+    {
+        Text [ en-US ] = "Skewness";
+    };
+    String SID_CALC_RANGE
+    {
+        Text [ en-US ] = "Range";
+    };
+    String SID_CALC_MIN
+    {
+        Text [ en-US ] = "Minimum";
+    };
+    String SID_CALC_MAX
+    {
+        Text [ en-US ] = "Maximum";
+    };
+    String SID_CALC_SUM
+    {
+        Text [ en-US ] = "Sum";
+    };
+    String SID_CALC_COUNT
+    {
+        Text [ en-US ] = "Count";
+    };
+
+    /* 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 ] = "Geometric";
+    };
+    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";
+    };
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */