Make room for more IDs and rename common IDs in Statistics dialogs

Change-Id: I0c7c28ef77676f8bcb6cf66423d30e3ea164a5bc

4 files changed, 57 insertions, 59 deletions

diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index 1fa3a6eed40f..000687d09b42 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -78,7 +78,8 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_UNDO_NAME));
     aOutput.newLine();
 
-    aOutput.writeString("Alpha");
+    // Alpha
+    aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_ALPHA));
     aOutput.nextColumn();
     aOutput.writeValue(0.05);
     aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
@@ -110,7 +111,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aTemplate.autoReplaceAddress("%VAR2_VARIANCE%", aOutput.current());
     aOutput.newLine();
 
-    aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_OBSERVATIONS_LABEL));
+    aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=COUNT(%VAR1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
index cd2bacefbbc2..2574797c6f5a 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
+++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
@@ -56,49 +56,49 @@
 #define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME         64
 #define STR_MOVING_AVERAGE_UNDO_NAME                65
 #define STR_TTEST                                   66
-#define STR_FTEST                                   67
-#define STR_TTEST_UNDO_NAME                         68
+#define STR_TTEST_UNDO_NAME                         67
+#define STR_FTEST                                   68
 #define STR_FTEST_UNDO_NAME                         69
 
-#define STR_COLUMN_LABEL_TEMPLATE                   70
-#define STR_ROW_LABEL_TEMPLATE                      71
+#define STR_COLUMN_LABEL_TEMPLATE                   100
+#define STR_ROW_LABEL_TEMPLATE                      101
 
-#define STR_ANOVA_SINGLE_FACTOR_LABEL               80
-#define STR_ANOVA_LABEL_GROUPS                      81
-#define STR_ANOVA_LABEL_BETWEEN_GROUPS              82
-#define STR_ANOVA_LABEL_WITHIN_GROUPS               83
-#define STR_ANOVA_LABEL_SOURCE_OF_VARIATION         84
-#define STR_ANOVA_LABEL_SS                          85
-#define STR_ANOVA_LABEL_DF                          86
-#define STR_ANOVA_LABEL_MS                          87
-#define STR_ANOVA_LABEL_F                           88
-#define STR_ANOVA_LABEL_P_VALUE                     89
-#define STR_ANOVA_LABEL_F_CRITICAL                  90
-#define STR_ANOVA_LABEL_TOTAL                       91
-#define STR_ANOVA_TWO_FACTOR_LABEL                  92
+#define STR_ANOVA_SINGLE_FACTOR_LABEL               110
+#define STR_ANOVA_LABEL_GROUPS                      111
+#define STR_ANOVA_LABEL_BETWEEN_GROUPS              112
+#define STR_ANOVA_LABEL_WITHIN_GROUPS               113
+#define STR_ANOVA_LABEL_SOURCE_OF_VARIATION         114
+#define STR_ANOVA_LABEL_SS                          115
+#define STR_ANOVA_LABEL_DF                          116
+#define STR_ANOVA_LABEL_MS                          117
+#define STR_ANOVA_LABEL_F                           118
+#define STR_ANOVA_LABEL_P_VALUE                     119
+#define STR_ANOVA_LABEL_F_CRITICAL                  120
+#define STR_ANOVA_LABEL_TOTAL                       121
+#define STR_ANOVA_TWO_FACTOR_LABEL                  122
 
-#define STR_CORRELATION_LABEL                      100
-#define STR_COVARIANCE_LABEL                       101
-#define STR_LABEL_ALPHA                            102
-#define STR_VARIABLE_1_LABEL                       103
-#define STR_VARIABLE_2_LABEL                       104
+#define STR_CORRELATION_LABEL                      130
+#define STR_COVARIANCE_LABEL                       131
+#define STR_LABEL_ALPHA                            132
+#define STR_VARIABLE_1_LABEL                       133
+#define STR_VARIABLE_2_LABEL                       134
+#define STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL     135
+#define STR_OBSERVATIONS_LABEL                     136
 
-#define STR_FTEST_OBSERVATIONS_LABEL               110
-#define STR_FTEST_P_RIGHT_TAIL                     111
-#define STR_FTEST_F_CRITICAL_RIGHT_TAIL            112
-#define STR_FTEST_P_LEFT_TAIL                      113
-#define STR_FTEST_F_CRITICAL_LEFT_TAIL             114
-#define STR_FTEST_P_TWO_TAIL                       115
-#define STR_FTEST_F_CRITICAL_TWO_TAIL              116
+#define STR_FTEST_P_RIGHT_TAIL                     140
+#define STR_FTEST_F_CRITICAL_RIGHT_TAIL            141
+#define STR_FTEST_P_LEFT_TAIL                      142
+#define STR_FTEST_F_CRITICAL_LEFT_TAIL             143
+#define STR_FTEST_P_TWO_TAIL                       144
+#define STR_FTEST_F_CRITICAL_TWO_TAIL              145
 
-#define STR_TTEST_PEARSON_CORRELATION              120
-#define STR_TTEST_HYPOTHESIZED_MEAN_DIFFERENCE     121
-#define STR_TTEST_OBSERVED_MEAN_DIFFERENCE         122
-#define STR_TTEST_VARIANCE_OF_THE_DIFFERENCES      123
-#define STR_TTEST_T_STAT                           124
-#define STR_TTEST_P_ONE_TAIL                       125
-#define STR_TTEST_T_CRITICAL_ONE_TAIL              126
-#define STR_TTEST_P_TWO_TAIL                       127
-#define STR_TTEST_T_CRITICAL_TWO_TAIL              128
+#define STR_TTEST_PEARSON_CORRELATION              150
+#define STR_TTEST_OBSERVED_MEAN_DIFFERENCE         151
+#define STR_TTEST_VARIANCE_OF_THE_DIFFERENCES      152
+#define STR_TTEST_T_STAT                           153
+#define STR_TTEST_P_ONE_TAIL                       154
+#define STR_TTEST_T_CRITICAL_ONE_TAIL              155
+#define STR_TTEST_P_TWO_TAIL                       156
+#define STR_TTEST_T_CRITICAL_TWO_TAIL              157
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
index 4faf2c56277b..49c9575b9c37 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
+++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
@@ -276,24 +276,21 @@ Resource RID_STATISTICS_DLGS
         Text [ en-US ] = "Sampling";
     };
 
-    String STR_TTEST
+    String STR_FTEST
     {
-        Text [ en-US ] = "t-test";
+        Text [ en-US ] = "F-test";
     };
-
-    String STR_FTEST
+    String STR_FTEST_UNDO_NAME
     {
         Text [ en-US ] = "F-test";
     };
-
-    String STR_TTEST_UNDO_NAME
+    String STR_TTEST
     {
         Text [ en-US ] = "t-test";
     };
-
-    String STR_FTEST_UNDO_NAME
+    String STR_TTEST_UNDO_NAME
     {
-        Text [ en-US ] = "F-test";
+        Text [ en-US ] = "t-test";
     };
 
     /* Common */
@@ -317,12 +314,16 @@ Resource RID_STATISTICS_DLGS
     {
         Text [ en-US ] = "Variable 2";
     };
-
-    /*F Test */
-    String STR_FTEST_OBSERVATIONS_LABEL
+    String STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL
+    {
+        Text [ en-US ] = "Hypothesized Mean Difference";
+    };
+    String STR_OBSERVATIONS_LABEL
     {
         Text [ en-US ] = "Observations";
     };
+
+    /*F Test */
     String STR_FTEST_P_RIGHT_TAIL
     {
         Text [ en-US ] = "P (F<=f) right-tail";
@@ -353,10 +354,6 @@ Resource RID_STATISTICS_DLGS
     {
         Text [ en-US ] = "Pearson Correlation";
     };
-    String STR_TTEST_HYPOTHESIZED_MEAN_DIFFERENCE
-    {
-        Text [ en-US ] = "Hypothesized Mean Difference";
-    };
     String STR_TTEST_OBSERVED_MEAN_DIFFERENCE
     {
         Text [ en-US ] = "Observed Mean Difference";
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index d61ba62f5de7..615cca4e632d 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -79,14 +79,14 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Alpha
-    aOutput.writeString("Alpha");
+    aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_ALPHA));
     aOutput.nextColumn();
     aOutput.writeValue(0.05);
     aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
     aOutput.newLine();
 
     // Hypothesized mean difference
-    aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_HYPOTHESIZED_MEAN_DIFFERENCE));
+    aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
     aOutput.nextColumn();
     aOutput.writeValue(0);
     aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current());
@@ -117,7 +117,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
     aOutput.newLine();
 
     // Observations
-    aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_OBSERVATIONS_LABEL));
+    aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL));
     aOutput.nextColumn();
     aTemplate.setTemplate("=COUNT(%VAR1_RANGE%)");
     aOutput.writeFormula(aTemplate.getTemplate());