summaryrefslogtreecommitdiff
path: root/sc/source/ui/StatisticsDialogs
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-03 14:03:54 +0200
committerNoel Grandin <noel@peralex.com>2014-11-05 08:44:19 +0200
commit705c48d32eec0aa5180e60ca157daca4b154e4a3 (patch)
tree97f43496f4b429a2b8d03b1e71cb2a1c33142a15 /sc/source/ui/StatisticsDialogs
parentb7d8a58ff2698ffc6e22943f64aa97c5ea253bd9 (diff)
fdo#38835 strip out OUString globals
they are largely unnecessary these days, since our OUString infrastructure gained optimised handling for static char constants. Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
Diffstat (limited to 'sc/source/ui/StatisticsDialogs')
-rw-r--r--sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx4
-rw-r--r--sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx7
-rw-r--r--sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx7
-rw-r--r--sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx4
-rw-r--r--sc/source/ui/StatisticsDialogs/FTestDialog.cxx9
-rw-r--r--sc/source/ui/StatisticsDialogs/TTestDialog.cxx9
6 files changed, 12 insertions, 28 deletions
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index efb130e1a97b..03a71ad43dd2 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -57,8 +57,8 @@ static sal_Int16 lclAnovaLabels[] =
0
};
-static const OUString strWildcardRange("%RANGE%");
-static const OUString strWildcardNumber("%NUMBER%");
+static const char strWildcardRange[] = "%RANGE%";
+static const char strWildcardNumber[] = "%NUMBER%";
OUString lclCreateMultiParameterFormula(
ScRangeList& aRangeList, const OUString& aFormulaTemplate,
diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
index 3184b2281e0c..e82c580c300e 100644
--- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
@@ -15,10 +15,7 @@
#include "CorrelationDialog.hxx"
-namespace
-{
- static const OUString strCorrelationTemplate("=CORREL(%VAR1%; %VAR2%)");
-}
+static const char strCorrelationTemplate[] = "=CORREL(%VAR1%; %VAR2%)";
ScCorrelationDialog::ScCorrelationDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -40,7 +37,7 @@ const OUString ScCorrelationDialog::getLabel()
const OUString ScCorrelationDialog::getTemplate()
{
- return strCorrelationTemplate;
+ return OUString(strCorrelationTemplate);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
index e26c650f5566..6dea71fc1fdd 100644
--- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
@@ -15,10 +15,7 @@
#include "CovarianceDialog.hxx"
-namespace
-{
- static const OUString strCovarianceTemplate("=COVAR(%VAR1%; %VAR2%)");
-}
+static const char strCovarianceTemplate[] = "=COVAR(%VAR1%; %VAR2%)";
ScCovarianceDialog::ScCovarianceDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
@@ -45,7 +42,7 @@ const OUString ScCovarianceDialog::getLabel()
const OUString ScCovarianceDialog::getTemplate()
{
- return strCovarianceTemplate;
+ return OUString(strCovarianceTemplate);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 157e974fadae..485c04398589 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -54,8 +54,8 @@ static const StatisticCalculation lclCalcDefinitions[] =
{ 0, NULL }
};
-static const OUString strWildcardRange("%RANGE%");
-static const OUString strWildcardNumber("%NUMBER%");
+static const char strWildcardRange[] = "%RANGE%";
+static const char strWildcardNumber[] = "%NUMBER%";
}
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index 2b3eb52944be..1fa3a6eed40f 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -28,13 +28,8 @@
#include "FTestDialog.hxx"
-namespace
-{
-
-static const OUString strWildcardVariable1Range("%VAR1_RANGE%");
-static const OUString strWildcardVariable2Range("%VAR2_RANGE%");
-
-}
+static const char strWildcardVariable1Range[] = "%VAR1_RANGE%";
+static const char strWildcardVariable2Range[] = "%VAR2_RANGE%";
ScFTestDialog::ScFTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index 684b40f9a2b1..b8f7e1a005d2 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -28,13 +28,8 @@
#include "TTestDialog.hxx"
-namespace
-{
-
-static const OUString strWildcardVariable1Range("%VAR1_RANGE%");
-static const OUString strWildcardVariable2Range("%VAR2_RANGE%");
-
-}
+static const char strWildcardVariable1Range[] = "%VAR1_RANGE%";
+static const char strWildcardVariable2Range[] = "%VAR2_RANGE%";
ScTTestDialog::ScTTestDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,