summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-10-30 00:32:52 +0100
committerEike Rathke <erack@redhat.com>2013-10-30 01:27:59 +0100
commit4eb1aa5b773110f66666d5aecf7d0df27c305c66 (patch)
treecdf678eae2a3a08e133ced5f81f6646b2cc762cd /sc
parent8df6531b2652c16004ad0977b81f4a822c3f2689 (diff)
use something different than the SID_ prefix confused with SlotID
Change-Id: I6e87b1288d05c698e7c71b28ca1c6d503b25a332
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx28
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc26
-rw-r--r--sc/source/ui/StatisticsDialogs/StatisticsDialogs.src26
3 files changed, 40 insertions, 40 deletions
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 39bf061f1a20..ed9bf1c17eb5 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -38,20 +38,20 @@ struct StatisticCalculation {
static const StatisticCalculation lclCalcDefinitions[] =
{
- { SID_CALC_MEAN, "=AVERAGE(%RANGE%)" },
- { SID_CALC_STD_ERROR, "=SQRT(VAR(%RANGE%)/COUNT(%RANGE%))"},
- { SID_CALC_MODE, "=MODE(%RANGE%)"},
- { SID_CALC_MEDIAN, "=MEDIAN(%RANGE%)"},
- { SID_CALC_VARIANCE, "=VAR(%RANGE%)"},
- { SID_CALC_STD_DEVIATION, "=STDEV(%RANGE%)"},
- { SID_CALC_KURTOSIS, "=KURT(%RANGE%)"},
- { SID_CALC_SKEWNESS, "=SKEW(%RANGE%)"},
- { SID_CALC_RANGE, "=MAX(%RANGE%)-MIN(%RANGE%)"},
- { SID_CALC_MIN, "=MIN(%RANGE%)"},
- { SID_CALC_MAX, "=MAX(%RANGE%)"},
- { SID_CALC_SUM, "=SUM(%RANGE%)"},
- { SID_CALC_COUNT, "=COUNT(%RANGE%)" },
- { 0, NULL }
+ { STRID_CALC_MEAN, "=AVERAGE(%RANGE%)" },
+ { STRID_CALC_STD_ERROR, "=SQRT(VAR(%RANGE%)/COUNT(%RANGE%))"},
+ { STRID_CALC_MODE, "=MODE(%RANGE%)"},
+ { STRID_CALC_MEDIAN, "=MEDIAN(%RANGE%)"},
+ { STRID_CALC_VARIANCE, "=VAR(%RANGE%)"},
+ { STRID_CALC_STD_DEVIATION, "=STDEV(%RANGE%)"},
+ { STRID_CALC_KURTOSIS, "=KURT(%RANGE%)"},
+ { STRID_CALC_SKEWNESS, "=SKEW(%RANGE%)"},
+ { STRID_CALC_RANGE, "=MAX(%RANGE%)-MIN(%RANGE%)"},
+ { STRID_CALC_MIN, "=MIN(%RANGE%)"},
+ { STRID_CALC_MAX, "=MAX(%RANGE%)"},
+ { STRID_CALC_SUM, "=SUM(%RANGE%)"},
+ { STRID_CALC_COUNT, "=COUNT(%RANGE%)" },
+ { 0, NULL }
};
static const OUString lclWildcardRange("%RANGE%");
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
index a6fe83f106f3..4686b3f25a27 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
+++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
@@ -33,19 +33,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 STRID_CALC_MEAN 21
+#define STRID_CALC_STD_ERROR 22
+#define STRID_CALC_MODE 23
+#define STRID_CALC_MEDIAN 24
+#define STRID_CALC_VARIANCE 25
+#define STRID_CALC_STD_DEVIATION 26
+#define STRID_CALC_KURTOSIS 27
+#define STRID_CALC_SKEWNESS 28
+#define STRID_CALC_RANGE 29
+#define STRID_CALC_MIN 30
+#define STRID_CALC_MAX 31
+#define STRID_CALC_SUM 32
+#define STRID_CALC_COUNT 33
#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME 34
#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME 35
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
index 63d5ba62c6b1..00ebc17b021d 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
+++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
@@ -40,55 +40,55 @@ Resource RID_STATISTICS_DLGS
{
Text [ en-US ] = "Descriptive Statistics";
};
- String SID_CALC_MEAN
+ String STRID_CALC_MEAN
{
Text [ en-US ] = "Mean";
};
- String SID_CALC_STD_ERROR
+ String STRID_CALC_STD_ERROR
{
Text [ en-US ] = "Standard Error";
};
- String SID_CALC_MODE
+ String STRID_CALC_MODE
{
Text [ en-US ] = "Mode";
};
- String SID_CALC_MEDIAN
+ String STRID_CALC_MEDIAN
{
Text [ en-US ] = "Median";
};
- String SID_CALC_VARIANCE
+ String STRID_CALC_VARIANCE
{
Text [ en-US ] = "Variance";
};
- String SID_CALC_STD_DEVIATION
+ String STRID_CALC_STD_DEVIATION
{
Text [ en-US ] = "Standard Deviation";
};
- String SID_CALC_KURTOSIS
+ String STRID_CALC_KURTOSIS
{
Text [ en-US ] = "Kurtosis";
};
- String SID_CALC_SKEWNESS
+ String STRID_CALC_SKEWNESS
{
Text [ en-US ] = "Skewness";
};
- String SID_CALC_RANGE
+ String STRID_CALC_RANGE
{
Text [ en-US ] = "Range";
};
- String SID_CALC_MIN
+ String STRID_CALC_MIN
{
Text [ en-US ] = "Minimum";
};
- String SID_CALC_MAX
+ String STRID_CALC_MAX
{
Text [ en-US ] = "Maximum";
};
- String SID_CALC_SUM
+ String STRID_CALC_SUM
{
Text [ en-US ] = "Sum";
};
- String SID_CALC_COUNT
+ String STRID_CALC_COUNT
{
Text [ en-US ] = "Count";
};