[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source sc/uiconfig

[Kohei Yoshida]

 sc/source/ui/StatisticsDialogs/FTestDialog.cxx       |    4 +++-
 sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc |    6 ++++--
 sc/source/ui/StatisticsDialogs/StatisticsDialogs.src |   10 ++++++++++
 sc/source/ui/StatisticsDialogs/TTestDialog.cxx       |    4 +++-
 sc/uiconfig/scalc/ui/ttestdialog.ui                  |    1 -
 5 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit b866e7bcb41fb8bfaa0479b11c9ebcf4abd07c4a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed May 21 22:13:53 2014 -0400

    Label t-test and F-test for their respective dialogs.
    
    Change-Id: I8afab424c051453005432c5291af49eb208dd22c
    (cherry picked from commit 05d7608616351cb6f5a9e06398c545813947006c)

diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index 4070376..6f07778 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -42,7 +42,9 @@ ScFTestDialog::ScFTestDialog(
     ScStatisticsTwoVariableDialog(
             pSfxBindings, pChildWindow, pParent, pViewData,
             "TTestDialog", "modules/scalc/ui/ttestdialog.ui" )
-{}
+{
+    SetText(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST));
+}
 
 ScFTestDialog::~ScFTestDialog()
 {}
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
index f07332e9..3cbed42 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
+++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
@@ -53,8 +53,10 @@
 #define STR_COVARIANCE_UNDO_NAME                    63
 #define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME         64
 #define STR_MOVING_AVERAGE_UNDO_NAME                65
-#define STR_TTEST_UNDO_NAME                         66
-#define STR_FTEST_UNDO_NAME                         67
+#define STR_TTEST                                   66
+#define STR_FTEST                                   67
+#define STR_TTEST_UNDO_NAME                         68
+#define STR_FTEST_UNDO_NAME                         69
 
 #define STR_COLUMN_LABEL_TEMPLATE                   70
 #define STR_ROW_LABEL_TEMPLATE                      71
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
index 702f54f..b084019 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
+++ b/sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
@@ -268,6 +268,16 @@ Resource RID_STATISTICS_DLGS
         Text [ en-US ] = "Sampling";
     };
 
+    String STR_TTEST
+    {
+        Text [ en-US ] = "t-test";
+    };
+
+    String STR_FTEST
+    {
+        Text [ en-US ] = "F-test";
+    };
+
     String STR_TTEST_UNDO_NAME
     {
         Text [ en-US ] = "t-test";
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index 228063d..9e335c9 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -42,7 +42,9 @@ ScTTestDialog::ScTTestDialog(
     ScStatisticsTwoVariableDialog(
             pSfxBindings, pChildWindow, pParent, pViewData,
             "TTestDialog", "modules/scalc/ui/ttestdialog.ui" )
-{}
+{
+    SetText(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST));
+}
 
 ScTTestDialog::~ScTTestDialog()
 {}
diff --git a/sc/uiconfig/scalc/ui/ttestdialog.ui b/sc/uiconfig/scalc/ui/ttestdialog.ui
index 4fd3dec..86ba27d 100644
--- a/sc/uiconfig/scalc/ui/ttestdialog.ui
+++ b/sc/uiconfig/scalc/ui/ttestdialog.ui
@@ -6,7 +6,6 @@
   <object class="GtkDialog" id="TTestDialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Moving Average</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">