mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unwind RID_STATISTICS_DLGS local resource

Browse Source 
Change-Id: Ib5e7692cce9e097250182ec1518e93848fdc9b86
This commit is contained in:
Caolán McNamara
2017-02-10 13:05:45 +00:00
parent 55e203a0c6
commit a194597597
19 changed files with 649 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
sc/inc/sc.hrc
View File

@@ -696,7 +696,6 @@
#define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54) #define RID_GRAPHIC_OBJECTBAR (SC_RESOURCE_START+54)
#define RID_MEDIA_OBJECTBAR (SC_RESOURCE_START+60) #define RID_MEDIA_OBJECTBAR (SC_RESOURCE_START+60)
#define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62) #define RID_FUNCTION_CATEGORIES (SC_RESOURCE_START+62)
#define RID_STATISTICS_DLGS (SC_RESOURCE_START+64)
#define STR_START (SC_RESOURCE_START+100) #define STR_START (SC_RESOURCE_START+100)
#define STR_ROWHEIGHT (STR_START) #define STR_ROWHEIGHT (STR_START)
@@ -989,7 +988,124 @@
#define STR_TITLE_AUTHOR (STR_START + 442) #define STR_TITLE_AUTHOR (STR_START + 442)
#define STR_TITLE_DATE (STR_START + 443) #define STR_TITLE_DATE (STR_START + 443)
#define STR_UNKNOWN_USER_CONFLICT (STR_START + 444) #define STR_UNKNOWN_USER_CONFLICT (STR_START + 444)
#define STR_END (STR_UNKNOWN_USER_CONFLICT)
#define STR_UNDO_DISTRIBUTION_TEMPLATE (STR_START + 445)
#define STR_DISTRIBUTION_UNIFORM_REAL (STR_START + 446)
#define STR_DISTRIBUTION_UNIFORM_INTEGER (STR_START + 447)
#define STR_DISTRIBUTION_NORMAL (STR_START + 448)
#define STR_DISTRIBUTION_CAUCHY (STR_START + 449)
#define STR_DISTRIBUTION_BERNOULLI (STR_START + 450)
#define STR_DISTRIBUTION_BINOMIAL (STR_START + 451)
#define STR_DISTRIBUTION_NEGATIVE_BINOMIAL (STR_START + 452)
#define STR_DISTRIBUTION_CHI_SQUARED (STR_START + 453)
#define STR_DISTRIBUTION_GEOMETRIC (STR_START + 454)
#define STR_RNG_PARAMETER_MINIMUM (STR_START + 455)
#define STR_RNG_PARAMETER_MAXIMUM (STR_START + 456)
#define STR_RNG_PARAMETER_MEAN (STR_START + 457)
#define STR_RNG_PARAMETER_STANDARD_DEVIATION (STR_START + 458)
#define STR_RNG_PARAMETER_STANDARD_MEDIAN (STR_START + 459)
#define STR_RNG_PARAMETER_STANDARD_SIGMA (STR_START + 460)
#define STR_RNG_PARAMETER_STANDARD_PROBABILITY (STR_START + 461)
#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS (STR_START + 462)
#define STR_RNG_PARAMETER_STANDARD_NU_VALUE (STR_START + 463)
#define STR_SAMPLING_UNDO_NAME (STR_START + 464)
#define STRID_CALC_MEAN (STR_START + 465)
#define STRID_CALC_STD_ERROR (STR_START + 466)
#define STRID_CALC_MODE (STR_START + 467)
#define STRID_CALC_MEDIAN (STR_START + 468)
#define STRID_CALC_VARIANCE (STR_START + 469)
#define STRID_CALC_STD_DEVIATION (STR_START + 470)
#define STRID_CALC_KURTOSIS (STR_START + 471)
#define STRID_CALC_SKEWNESS (STR_START + 472)
#define STRID_CALC_RANGE (STR_START + 473)
#define STRID_CALC_MIN (STR_START + 474)
#define STRID_CALC_MAX (STR_START + 475)
#define STRID_CALC_SUM (STR_START + 476)
#define STRID_CALC_COUNT (STR_START + 477)
#define STRID_CALC_FIRST_QUARTILE (STR_START + 478)
#define STRID_CALC_THIRD_QUARTILE (STR_START + 479)
#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME (STR_START + 480)
#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME (STR_START + 481)
#define STR_CORRELATION_UNDO_NAME (STR_START + 482)
#define STR_COVARIANCE_UNDO_NAME (STR_START + 483)
#define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME (STR_START + 484)
#define STR_MOVING_AVERAGE_UNDO_NAME (STR_START + 485)
#define STR_REGRESSION (STR_START + 486)
#define STR_REGRESSION_UNDO_NAME (STR_START + 487)
#define STR_TTEST (STR_START + 488)
#define STR_TTEST_UNDO_NAME (STR_START + 489)
#define STR_FTEST (STR_START + 490)
#define STR_FTEST_UNDO_NAME (STR_START + 491)
#define STR_ZTEST (STR_START + 492)
#define STR_ZTEST_UNDO_NAME (STR_START + 493)
#define STR_CHI_SQUARE_TEST (STR_START + 494)
#define STR_COLUMN_LABEL_TEMPLATE (STR_START + 495)
#define STR_ROW_LABEL_TEMPLATE (STR_START + 496)
#define STR_ANOVA_SINGLE_FACTOR_LABEL (STR_START + 497)
#define STR_ANOVA_LABEL_GROUPS (STR_START + 498)
#define STR_ANOVA_LABEL_BETWEEN_GROUPS (STR_START + 499)
#define STR_ANOVA_LABEL_WITHIN_GROUPS (STR_START + 500)
#define STR_ANOVA_LABEL_SOURCE_OF_VARIATION (STR_START + 501)
#define STR_ANOVA_LABEL_SS (STR_START + 502)
#define STR_ANOVA_LABEL_DF (STR_START + 503)
#define STR_ANOVA_LABEL_MS (STR_START + 504)
#define STR_ANOVA_LABEL_F (STR_START + 505)
#define STR_ANOVA_LABEL_P_VALUE (STR_START + 506)
#define STR_ANOVA_LABEL_F_CRITICAL (STR_START + 507)
#define STR_ANOVA_LABEL_TOTAL (STR_START + 508)
#define STR_ANOVA_TWO_FACTOR_LABEL (STR_START + 509)
#define STR_CORRELATION_LABEL (STR_START + 510)
#define STR_COVARIANCE_LABEL (STR_START + 511)
#define STR_LABEL_ALPHA (STR_START + 512)
#define STR_VARIABLE_1_LABEL (STR_START + 513)
#define STR_VARIABLE_2_LABEL (STR_START + 514)
#define STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL (STR_START + 515)
#define STR_OBSERVATIONS_LABEL (STR_START + 516)
#define STR_OBSERVED_MEAN_DIFFERENCE_LABEL (STR_START + 517)
#define STR_DEGREES_OF_FREEDOM_LABEL (STR_START + 518)
#define STR_P_VALUE_LABEL (STR_START + 519)
#define STR_CRITICAL_VALUE_LABEL (STR_START + 520)
#define STR_TEST_STATISTIC_LABEL (STR_START + 521)
#define STR_LABEL_LINEAR (STR_START + 522)
#define STR_LABEL_LOGARITHMIC (STR_START + 523)
#define STR_LABEL_POWER (STR_START + 524)
#define STR_LABEL_REGRESSION_MODEL (STR_START + 525)
#define STR_LABEL_RSQUARED (STR_START + 526)
#define STR_LABEL_SLOPE (STR_START + 527)
#define STR_LABEL_INTERCEPT (STR_START + 528)
#define STR_FTEST_P_RIGHT_TAIL (STR_START + 529)
#define STR_FTEST_F_CRITICAL_RIGHT_TAIL (STR_START + 530)
#define STR_FTEST_P_LEFT_TAIL (STR_START + 531)
#define STR_FTEST_F_CRITICAL_LEFT_TAIL (STR_START + 532)
#define STR_FTEST_P_TWO_TAIL (STR_START + 533)
#define STR_FTEST_F_CRITICAL_TWO_TAIL (STR_START + 534)
#define STR_TTEST_PEARSON_CORRELATION (STR_START + 535)
#define STR_TTEST_VARIANCE_OF_THE_DIFFERENCES (STR_START + 536)
#define STR_TTEST_T_STAT (STR_START + 537)
#define STR_TTEST_P_ONE_TAIL (STR_START + 538)
#define STR_TTEST_T_CRITICAL_ONE_TAIL (STR_START + 539)
#define STR_TTEST_P_TWO_TAIL (STR_START + 540)
#define STR_TTEST_T_CRITICAL_TWO_TAIL (STR_START + 541)
#define STR_ZTEST_KNOWN_VARIANCE (STR_START + 542)
#define STR_ZTEST_Z_VALUE (STR_START + 543)
#define STR_ZTEST_P_ONE_TAIL (STR_START + 544)
#define STR_ZTEST_Z_CRITICAL_ONE_TAIL (STR_START + 545)
#define STR_ZTEST_P_TWO_TAIL (STR_START + 546)
#define STR_ZTEST_Z_CRITICAL_TWO_TAIL (STR_START + 547)
#define STR_END (STR_ZTEST_Z_CRITICAL_TWO_TAIL)
#define BMP_START (STR_END) #define BMP_START (STR_END)

23
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "AnalysisOfVarianceDialog.hxx" #include "AnalysisOfVarianceDialog.hxx"
@@ -183,7 +182,7 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke
else else
{ {
sal_Int16 aLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE; sal_Int16 aLabelId = (aGroupedBy == BY_COLUMN) ? STR_COLUMN_LABEL_TEMPLATE : STR_ROW_LABEL_TEMPLATE;
OUString aLabelTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, aLabelId)); OUString aLabelTemplate(SC_RESSTR(aLabelId));
for (size_t i = 0; i < rRangeList.size(); i++) for (size_t i = 0; i < rRangeList.size(); i++)
{ {
@@ -199,11 +198,11 @@ void ScAnalysisOfVarianceDialog::RowColumn(ScRangeList& rRangeList, AddressWalke
void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output, FormulaTemplate& aTemplate) void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output, FormulaTemplate& aTemplate)
{ {
output.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_SINGLE_FACTOR_LABEL)); output.writeBoldString(SC_RESSTR(STR_ANOVA_SINGLE_FACTOR_LABEL));
output.newLine(); output.newLine();
double aAlphaValue = mpAlphaField->GetValue() / 100.0; double aAlphaValue = mpAlphaField->GetValue() / 100.0;
output.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_ALPHA)); output.writeString(SC_RESSTR(STR_LABEL_ALPHA));
output.nextColumn(); output.nextColumn();
output.writeValue(aAlphaValue); output.writeValue(aAlphaValue);
aTemplate.autoReplaceAddress("%ALPHA%", output.current()); aTemplate.autoReplaceAddress("%ALPHA%", output.current());
@@ -213,7 +212,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
// Write labels // Write labels
for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++) for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
{ {
output.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, lclBasicStatistics[i].aLabelId)); output.writeString(SC_RESSTR(lclBasicStatistics[i].aLabelId));
output.nextColumn(); output.nextColumn();
} }
output.newLine(); output.newLine();
@@ -245,7 +244,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
output.resetColumn(); output.resetColumn();
for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++) for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
{ {
output.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, lclAnovaLabels[i])); output.writeString(SC_RESSTR(lclAnovaLabels[i]));
output.nextColumn(); output.nextColumn();
} }
output.nextRow(); output.nextRow();
@@ -256,7 +255,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
{ {
// Label // Label
output.resetColumn(); output.resetColumn();
output.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_BETWEEN_GROUPS)); output.writeString(SC_RESSTR(STR_ANOVA_LABEL_BETWEEN_GROUPS));
output.nextColumn(); output.nextColumn();
// Sum of Squares // Sum of Squares
@@ -302,7 +301,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
{ {
// Label // Label
output.resetColumn(); output.resetColumn();
output.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_WITHIN_GROUPS)); output.writeString(SC_RESSTR(STR_ANOVA_LABEL_WITHIN_GROUPS));
output.nextColumn(); output.nextColumn();
// Sum of Squares // Sum of Squares
@@ -329,7 +328,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
{ {
// Label // Label
output.resetColumn(); output.resetColumn();
output.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_TOTAL)); output.writeString(SC_RESSTR(STR_ANOVA_LABEL_TOTAL));
output.nextColumn(); output.nextColumn();
// Sum of Squares // Sum of Squares
@@ -347,7 +346,7 @@ void ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, FormulaTemplate& aTemplate) void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, FormulaTemplate& aTemplate)
{ {
output.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_TWO_FACTOR_LABEL)); output.writeBoldString(SC_RESSTR(STR_ANOVA_TWO_FACTOR_LABEL));
output.newLine(); output.newLine();
double aAlphaValue = mpAlphaField->GetValue() / 100.0; double aAlphaValue = mpAlphaField->GetValue() / 100.0;
@@ -361,7 +360,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
// Write labels // Write labels
for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++) for(sal_Int32 i = 0; lclBasicStatistics[i].aLabelId != 0; i++)
{ {
output.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, lclBasicStatistics[i].aLabelId)); output.writeString(SC_RESSTR(lclBasicStatistics[i].aLabelId));
output.nextColumn(); output.nextColumn();
} }
output.newLine(); output.newLine();
@@ -410,7 +409,7 @@ void ScAnalysisOfVarianceDialog::AnovaTwoFactor(AddressWalkerWriter& output, For
// Write ANOVA labels // Write ANOVA labels
for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++) for(sal_Int32 i = 0; lclAnovaLabels[i] != 0; i++)
{ {
output.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, lclAnovaLabels[i])); output.writeString(SC_RESSTR(lclAnovaLabels[i]));
output.nextColumn(); output.nextColumn();
} }
output.nextRow(); output.nextRow();

15
sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "ChiSquareTestDialog.hxx" #include "ChiSquareTestDialog.hxx"
@@ -33,7 +32,7 @@ ScChiSquareTestDialog::ScChiSquareTestDialog(
pSfxBindings, pChildWindow, pParent, pViewData, pSfxBindings, pChildWindow, pParent, pViewData,
"ChiSquareTestDialog", "modules/scalc/ui/chisquaretestdialog.ui" ) "ChiSquareTestDialog", "modules/scalc/ui/chisquaretestdialog.ui" )
{ {
SetText(SC_STRLOAD(RID_STATISTICS_DLGS, STR_CHI_SQUARE_TEST)); SetText(SC_RESSTR(STR_CHI_SQUARE_TEST));
} }
ScChiSquareTestDialog::~ScChiSquareTestDialog() ScChiSquareTestDialog::~ScChiSquareTestDialog()
@@ -57,18 +56,18 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%RANGE%", mInputRange); aTemplate.autoReplaceRange("%RANGE%", mInputRange);
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_CHI_SQUARE_TEST)); aOutput.writeBoldString(SC_RESSTR(STR_CHI_SQUARE_TEST));
aOutput.newLine(); aOutput.newLine();
// Alpha // Alpha
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_ALPHA)); aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeValue(0.05); aOutput.writeValue(0.05);
aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current()); aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
// DF // DF
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_DEGREES_OF_FREEDOM_LABEL)); aOutput.writeString(SC_RESSTR(STR_DEGREES_OF_FREEDOM_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=(COLUMNS(%RANGE%) - 1) * (ROWS(%RANGE%) - 1)"); aTemplate.setTemplate("=(COLUMNS(%RANGE%) - 1) * (ROWS(%RANGE%) - 1)");
aTemplate.autoReplaceAddress("%DEGREES_OF_FREEDOM%", aOutput.current()); aTemplate.autoReplaceAddress("%DEGREES_OF_FREEDOM%", aOutput.current());
@@ -76,7 +75,7 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// p Value // p Value
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_P_VALUE_LABEL)); aOutput.writeString(SC_RESSTR(STR_P_VALUE_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=CHITEST(%RANGE%; MMULT(MMULT(%RANGE%;TRANSPOSE(IF(COLUMN(%RANGE%))));MMULT(TRANSPOSE(IF(ROW(%RANGE%)));%RANGE%)) / SUM(%RANGE%))"); aTemplate.setTemplate("=CHITEST(%RANGE%; MMULT(MMULT(%RANGE%;TRANSPOSE(IF(COLUMN(%RANGE%))));MMULT(TRANSPOSE(IF(ROW(%RANGE%)));%RANGE%)) / SUM(%RANGE%))");
aTemplate.autoReplaceAddress("%P_VALUE%", aOutput.current()); aTemplate.autoReplaceAddress("%P_VALUE%", aOutput.current());
@@ -84,14 +83,14 @@ ScRange ScChiSquareTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// Test Statistic // Test Statistic
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TEST_STATISTIC_LABEL)); aOutput.writeString(SC_RESSTR(STR_TEST_STATISTIC_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=CHIINV(%P_VALUE%; %DEGREES_OF_FREEDOM%)"); aTemplate.setTemplate("=CHIINV(%P_VALUE%; %DEGREES_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// Critical value // Critical value
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_CRITICAL_VALUE_LABEL)); aOutput.writeString(SC_RESSTR(STR_CRITICAL_VALUE_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=CHIINV(%ALPHA%; %DEGREES_OF_FREEDOM%)"); aTemplate.setTemplate("=CHIINV(%ALPHA%; %DEGREES_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());

3
sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx
View File

@@ -11,7 +11,6 @@
#include "docsh.hxx" #include "docsh.hxx"
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "StatisticsDialogs.hrc"
#include "CorrelationDialog.hxx" #include "CorrelationDialog.hxx"
@@ -30,7 +29,7 @@ bool ScCorrelationDialog::Close()
const OUString ScCorrelationDialog::getLabel() const OUString ScCorrelationDialog::getLabel()
{ {
return SC_STRLOAD(RID_STATISTICS_DLGS, STR_CORRELATION_LABEL); return SC_RESSTR(STR_CORRELATION_LABEL);
} }
const OUString ScCorrelationDialog::getTemplate() const OUString ScCorrelationDialog::getTemplate()

3
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx
View File

@@ -11,7 +11,6 @@
#include "docsh.hxx" #include "docsh.hxx"
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "StatisticsDialogs.hrc"
#include "CovarianceDialog.hxx" #include "CovarianceDialog.hxx"
@@ -35,7 +34,7 @@ bool ScCovarianceDialog::Close()
const OUString ScCovarianceDialog::getLabel() const OUString ScCovarianceDialog::getLabel()
{ {
return SC_STRLOAD(RID_STATISTICS_DLGS, STR_COVARIANCE_LABEL); return SC_RESSTR(STR_COVARIANCE_LABEL);
} }
const OUString ScCovarianceDialog::getTemplate() const OUString ScCovarianceDialog::getTemplate()

7
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "DescriptiveStatisticsDialog.hxx" #include "DescriptiveStatisticsDialog.hxx"
@@ -98,9 +97,9 @@ ScRange ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
for( ; pIterator->hasNext(); pIterator->next() ) for( ; pIterator->hasNext(); pIterator->next() )
{ {
if (mGroupedBy == BY_COLUMN) if (mGroupedBy == BY_COLUMN)
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_COLUMN_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
else else
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ROW_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1); aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1);
aOutput.writeBoldString(aTemplate.getTemplate()); aOutput.writeBoldString(aTemplate.getTemplate());
@@ -113,7 +112,7 @@ ScRange ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
// Write calculation labels // Write calculation labels
for(sal_Int32 i = 0; lclCalcDefinitions[i].aFormula != nullptr; i++) for(sal_Int32 i = 0; lclCalcDefinitions[i].aFormula != nullptr; i++)
{ {
OUString aLabel(SC_STRLOAD(RID_STATISTICS_DLGS, lclCalcDefinitions[i].aCalculationNameId)); OUString aLabel(SC_RESSTR(lclCalcDefinitions[i].aCalculationNameId));
aOutput.writeString(aLabel); aOutput.writeString(aLabel);
aOutput.nextRow(); aOutput.nextRow();
} }

7
sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "ExponentialSmoothingDialog.hxx" #include "ExponentialSmoothingDialog.hxx"
@@ -67,7 +66,7 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
double aSmoothingFactor = mpSmoothingFactor->GetValue() / 100.0; double aSmoothingFactor = mpSmoothingFactor->GetValue() / 100.0;
// Alpha // Alpha
output.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_ALPHA)); output.writeBoldString(SC_RESSTR(STR_LABEL_ALPHA));
output.nextRow(); output.nextRow();
// Alpha Value // Alpha Value
@@ -92,9 +91,9 @@ ScRange ScExponentialSmoothingDialog::ApplyOutput(ScDocShell* pDocShell)
// Write column label // Write column label
if (mGroupedBy == BY_COLUMN) if (mGroupedBy == BY_COLUMN)
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_COLUMN_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
else else
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ROW_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1); aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1);
output.writeBoldString(aTemplate.getTemplate()); output.writeBoldString(aTemplate.getTemplate());
output.nextRow(); output.nextRow();

33
sc/source/ui/StatisticsDialogs/FTestDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "FTestDialog.hxx" #include "FTestDialog.hxx"
@@ -33,7 +32,7 @@ ScFTestDialog::ScFTestDialog(
pSfxBindings, pChildWindow, pParent, pViewData, pSfxBindings, pChildWindow, pParent, pViewData,
"TTestDialog", "modules/scalc/ui/ttestdialog.ui" ) "TTestDialog", "modules/scalc/ui/ttestdialog.ui" )
{ {
SetText(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST)); SetText(SC_RESSTR(STR_FTEST));
} }
ScFTestDialog::~ScFTestDialog() ScFTestDialog::~ScFTestDialog()
@@ -70,23 +69,23 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_UNDO_NAME)); aOutput.writeBoldString(SC_RESSTR(STR_FTEST_UNDO_NAME));
aOutput.newLine(); aOutput.newLine();
// Alpha // Alpha
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_ALPHA)); aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeValue(0.05); aOutput.writeValue(0.05);
aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current()); aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_VARIABLE_1_LABEL)); aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_VARIABLE_2_LABEL)); aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_MEAN)); aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)"); aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -95,7 +94,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_VARIANCE)); aOutput.writeString(SC_RESSTR(STRID_CALC_VARIANCE));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)"); aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -106,7 +105,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceAddress("%VARIABLE2_VARIANCE%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE2_VARIANCE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL)); aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)"); aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -117,7 +116,7 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceAddress("%VARIABLE2_OBSERVATIONS%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE2_OBSERVATIONS%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_DF)); aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_DF));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=%VARIABLE1_OBSERVATIONS% - 1"); aTemplate.setTemplate("=%VARIABLE1_OBSERVATIONS% - 1");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -128,46 +127,46 @@ ScRange ScFTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceAddress("%VARIABLE2_DEGREE_OF_FREEDOM%", aOutput.current()); aTemplate.autoReplaceAddress("%VARIABLE2_DEGREE_OF_FREEDOM%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_F)); aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_F));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=%VARIABLE1_VARIANCE% / %VARIABLE2_VARIANCE%"); aTemplate.setTemplate("=%VARIABLE1_VARIANCE% / %VARIABLE2_VARIANCE%");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%F_VALUE%", aOutput.current()); aTemplate.autoReplaceAddress("%F_VALUE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_P_RIGHT_TAIL)); aOutput.writeString(SC_RESSTR(STR_FTEST_P_RIGHT_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FDIST(%F_VALUE%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FDIST(%F_VALUE%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%P_RIGHT_TAIL_VALUE%", aOutput.current()); aTemplate.autoReplaceAddress("%P_RIGHT_TAIL_VALUE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_RIGHT_TAIL)); aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_RIGHT_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FINV(%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FINV(%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_P_LEFT_TAIL)); aOutput.writeString(SC_RESSTR(STR_FTEST_P_LEFT_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=1 - %P_RIGHT_TAIL_VALUE%"); aTemplate.setTemplate("=1 - %P_RIGHT_TAIL_VALUE%");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aTemplate.autoReplaceAddress("%P_LEFT_TAIL_VALUE%", aOutput.current()); aTemplate.autoReplaceAddress("%P_LEFT_TAIL_VALUE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_LEFT_TAIL)); aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_LEFT_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FINV(1-%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FINV(1-%ALPHA%; %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_P_TWO_TAIL)); aOutput.writeString(SC_RESSTR(STR_FTEST_P_TWO_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=2*MIN(%P_RIGHT_TAIL_VALUE%; %P_LEFT_TAIL_VALUE%)"); aTemplate.setTemplate("=2*MIN(%P_RIGHT_TAIL_VALUE%; %P_LEFT_TAIL_VALUE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_FTEST_F_CRITICAL_TWO_TAIL)); aOutput.writeString(SC_RESSTR(STR_FTEST_F_CRITICAL_TWO_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=FINV(1-(%ALPHA%/2); %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=FINV(1-(%ALPHA%/2); %VARIABLE1_DEGREE_OF_FREEDOM%; %VARIABLE2_DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());

9
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "MatrixComparisonGenerator.hxx" #include "MatrixComparisonGenerator.hxx"
@@ -88,9 +87,9 @@ ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
for (size_t i = 0; i < aRangeList.size(); i++) for (size_t i = 0; i < aRangeList.size(); i++)
{ {
if (mGroupedBy == BY_COLUMN) if (mGroupedBy == BY_COLUMN)
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_COLUMN_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
else else
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ROW_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber(strWildcardNumber, i + 1); aTemplate.applyNumber(strWildcardNumber, i + 1);
output.writeString(aTemplate.getTemplate()); output.writeString(aTemplate.getTemplate());
@@ -103,9 +102,9 @@ ScRange ScMatrixComparisonGenerator::ApplyOutput(ScDocShell* pDocShell)
for (size_t i = 0; i < aRangeList.size(); i++) for (size_t i = 0; i < aRangeList.size(); i++)
{ {
if (mGroupedBy == BY_COLUMN) if (mGroupedBy == BY_COLUMN)
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_COLUMN_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
else else
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ROW_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber(strWildcardNumber, i + 1); aTemplate.applyNumber(strWildcardNumber, i + 1);
output.writeString(aTemplate.getTemplate()); output.writeString(aTemplate.getTemplate());

5
sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "MovingAverageDialog.hxx" #include "MovingAverageDialog.hxx"
@@ -78,9 +77,9 @@ ScRange ScMovingAverageDialog::ApplyOutput(ScDocShell* pDocShell)
// Write label // Write label
if (mGroupedBy == BY_COLUMN) if (mGroupedBy == BY_COLUMN)
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_COLUMN_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_COLUMN_LABEL_TEMPLATE));
else else
aTemplate.setTemplate(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ROW_LABEL_TEMPLATE)); aTemplate.setTemplate(SC_RESSTR(STR_ROW_LABEL_TEMPLATE));
aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1); aTemplate.applyNumber("%NUMBER%", pIterator->index() + 1);
output.writeBoldString(aTemplate.getTemplate()); output.writeBoldString(aTemplate.getTemplate());

29
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include <random> #include <random>
@@ -283,8 +282,8 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers()
template<class RNG> template<class RNG>
void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, boost::optional<sal_Int8> aDecimalPlaces) void ScRandomNumberGeneratorDialog::GenerateNumbers(RNG& randomGenerator, const sal_Int16 aDistributionStringId, boost::optional<sal_Int8> aDecimalPlaces)
{ {
OUString aUndo = SC_STRLOAD(RID_STATISTICS_DLGS, STR_UNDO_DISTRIBUTION_TEMPLATE); OUString aUndo = SC_RESSTR(STR_UNDO_DISTRIBUTION_TEMPLATE);
OUString aDistributionName = SC_STRLOAD(RID_STATISTICS_DLGS, aDistributionStringId); OUString aDistributionName = SC_RESSTR(aDistributionStringId);
aUndo = aUndo.replaceAll("$(DISTRIBUTION)", aDistributionName); aUndo = aUndo.replaceAll("$(DISTRIBUTION)", aDistributionName);
ScDocShell* pDocShell = mpViewData->GetDocShell(); ScDocShell* pDocShell = mpViewData->GetDocShell();
@@ -437,19 +436,19 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
{ {
case DIST_UNIFORM: case DIST_UNIFORM:
{ {
mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MINIMUM)); mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MINIMUM));
mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MAXIMUM)); mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MAXIMUM));
mpParameter2Text->Show(); mpParameter2Text->Show();
mpParameter2Value->Show(); mpParameter2Value->Show();
break; break;
} }
case DIST_UNIFORM_INTEGER: case DIST_UNIFORM_INTEGER:
{ {
mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MINIMUM)); mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MINIMUM));
mpParameter1Value->SetDecimalDigits(0); mpParameter1Value->SetDecimalDigits(0);
mpParameter1Value->SetSpinSize(1); mpParameter1Value->SetSpinSize(1);
mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MAXIMUM)); mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MAXIMUM));
mpParameter2Value->SetDecimalDigits(0); mpParameter2Value->SetDecimalDigits(0);
mpParameter2Value->SetSpinSize(1); mpParameter2Value->SetSpinSize(1);
@@ -459,16 +458,16 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
} }
case DIST_NORMAL: case DIST_NORMAL:
{ {
mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_MEAN)); mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_MEAN));
mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_DEVIATION)); mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_DEVIATION));
mpParameter2Text->Show(); mpParameter2Text->Show();
mpParameter2Value->Show(); mpParameter2Value->Show();
break; break;
} }
case DIST_CAUCHY: case DIST_CAUCHY:
{ {
mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_MEDIAN)); mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_MEDIAN));
mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_SIGMA)); mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_SIGMA));
mpParameter2Text->Show(); mpParameter2Text->Show();
mpParameter2Value->Show(); mpParameter2Value->Show();
break; break;
@@ -476,7 +475,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
case DIST_BERNOULLI: case DIST_BERNOULLI:
case DIST_GEOMETRIC: case DIST_GEOMETRIC:
{ {
mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_PROBABILITY)); mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
mpParameter1Value->SetMin( 0 ); mpParameter1Value->SetMin( 0 );
mpParameter1Value->SetMax( PERCISION ); mpParameter1Value->SetMax( PERCISION );
mpParameter1Value->SetSpinSize(1000); mpParameter1Value->SetSpinSize(1000);
@@ -488,12 +487,12 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
case DIST_BINOMIAL: case DIST_BINOMIAL:
case DIST_NEGATIVE_BINOMIAL: case DIST_NEGATIVE_BINOMIAL:
{ {
mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_PROBABILITY)); mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_PROBABILITY));
mpParameter1Value->SetMin( 0 ); mpParameter1Value->SetMin( 0 );
mpParameter1Value->SetMax( PERCISION ); mpParameter1Value->SetMax( PERCISION );
mpParameter1Value->SetSpinSize(1000); mpParameter1Value->SetSpinSize(1000);
mpParameter2Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS)); mpParameter2Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS));
mpParameter2Value->SetDecimalDigits(0); mpParameter2Value->SetDecimalDigits(0);
mpParameter2Value->SetSpinSize(1); mpParameter2Value->SetSpinSize(1);
mpParameter2Value->SetMin(0); mpParameter2Value->SetMin(0);
@@ -504,7 +503,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, vo
} }
case DIST_CHI_SQUARED: case DIST_CHI_SQUARED:
{ {
mpParameter1Text->SetText( SC_STRLOAD( RID_STATISTICS_DLGS, STR_RNG_PARAMETER_STANDARD_NU_VALUE)); mpParameter1Text->SetText(SC_RESSTR(STR_RNG_PARAMETER_STANDARD_NU_VALUE));
mpParameter2Text->Hide(); mpParameter2Text->Hide();
mpParameter2Value->Hide(); mpParameter2Value->Hide();

15
sc/source/ui/StatisticsDialogs/RegressionDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "RegressionDialog.hxx" #include "RegressionDialog.hxx"
@@ -129,31 +128,31 @@ ScRange ScRegressionDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_REGRESSION)); aOutput.writeBoldString(SC_RESSTR(STR_REGRESSION));
aOutput.newLine(); aOutput.newLine();
aOutput.newLine(); aOutput.newLine();
aOutput.push(); aOutput.push();
// REGRESSION MODEL // REGRESSION MODEL
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_REGRESSION_MODEL)); aOutput.writeString(SC_RESSTR(STR_LABEL_REGRESSION_MODEL));
aOutput.nextRow(); aOutput.nextRow();
// RSQUARED // RSQUARED
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_RSQUARED)); aOutput.writeString(SC_RESSTR(STR_LABEL_RSQUARED));
aOutput.nextRow(); aOutput.nextRow();
// Standard Error // Standard Error
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_STD_ERROR)); aOutput.writeString(SC_RESSTR(STRID_CALC_STD_ERROR));
aOutput.nextRow(); aOutput.nextRow();
aOutput.nextRow(); aOutput.nextRow();
// Slope // Slope
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_SLOPE)); aOutput.writeString(SC_RESSTR(STR_LABEL_SLOPE));
aOutput.nextRow(); aOutput.nextRow();
// Intercept // Intercept
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_INTERCEPT)); aOutput.writeString(SC_RESSTR(STR_LABEL_INTERCEPT));
aOutput.nextRow(); aOutput.nextRow();
aOutput.nextRow(); aOutput.nextRow();
@@ -193,7 +192,7 @@ ScRange ScRegressionDialog::ApplyOutput(ScDocShell* pDocShell)
nColumn += 1; nColumn += 1;
// REGRESSION MODEL // REGRESSION MODEL
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, constRegressionModel[nRegressionIndex])); aOutput.writeString(SC_RESSTR(constRegressionModel[nRegressionIndex]));
aOutput.nextRow(); aOutput.nextRow();
// RSQUARED // RSQUARED

3
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
View File

@@ -20,7 +20,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "SamplingDialog.hxx" #include "SamplingDialog.hxx"
@@ -267,7 +266,7 @@ ScRange ScSamplingDialog::PerformRandomSampling(ScDocShell* pDocShell)
void ScSamplingDialog::PerformSampling() void ScSamplingDialog::PerformSampling()
{ {
OUString aUndo( SC_STRLOAD( RID_STATISTICS_DLGS, STR_SAMPLING_UNDO_NAME)); OUString aUndo(SC_RESSTR(STR_SAMPLING_UNDO_NAME));
ScDocShell* pDocShell = mViewData->GetDocShell(); ScDocShell* pDocShell = mViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager(); svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();

129
sc/source/ui/StatisticsDialogs/StatisticsDialogs.hrc
View File

@@ -1,129 +0,0 @@
/* -*- 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 20
#define STR_RNG_PARAMETER_MAXIMUM 21
#define STR_RNG_PARAMETER_MEAN 22
#define STR_RNG_PARAMETER_STANDARD_DEVIATION 23
#define STR_RNG_PARAMETER_STANDARD_MEDIAN 24
#define STR_RNG_PARAMETER_STANDARD_SIGMA 25
#define STR_RNG_PARAMETER_STANDARD_PROBABILITY 26
#define STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS 27
#define STR_RNG_PARAMETER_STANDARD_NU_VALUE 28
#define STR_SAMPLING_UNDO_NAME 39
#define STRID_CALC_MEAN 40
#define STRID_CALC_STD_ERROR 41
#define STRID_CALC_MODE 42
#define STRID_CALC_MEDIAN 43
#define STRID_CALC_VARIANCE 44
#define STRID_CALC_STD_DEVIATION 45
#define STRID_CALC_KURTOSIS 46
#define STRID_CALC_SKEWNESS 47
#define STRID_CALC_RANGE 48
#define STRID_CALC_MIN 49
#define STRID_CALC_MAX 50
#define STRID_CALC_SUM 51
#define STRID_CALC_COUNT 52
#define STRID_CALC_FIRST_QUARTILE 53
#define STRID_CALC_THIRD_QUARTILE 54
#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME 60
#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME 61
#define STR_CORRELATION_UNDO_NAME 62
#define STR_COVARIANCE_UNDO_NAME 63
#define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME 64
#define STR_MOVING_AVERAGE_UNDO_NAME 65
#define STR_REGRESSION 66
#define STR_REGRESSION_UNDO_NAME 67
#define STR_TTEST 68
#define STR_TTEST_UNDO_NAME 69
#define STR_FTEST 70
#define STR_FTEST_UNDO_NAME 71
#define STR_ZTEST 72
#define STR_ZTEST_UNDO_NAME 73
#define STR_CHI_SQUARE_TEST 74
#define STR_COLUMN_LABEL_TEMPLATE 100
#define STR_ROW_LABEL_TEMPLATE 101
#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 140
#define STR_COVARIANCE_LABEL 141
#define STR_LABEL_ALPHA 142
#define STR_VARIABLE_1_LABEL 143
#define STR_VARIABLE_2_LABEL 144
#define STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL 145
#define STR_OBSERVATIONS_LABEL 146
#define STR_OBSERVED_MEAN_DIFFERENCE_LABEL 147
#define STR_DEGREES_OF_FREEDOM_LABEL 148
#define STR_P_VALUE_LABEL 149
#define STR_CRITICAL_VALUE_LABEL 150
#define STR_TEST_STATISTIC_LABEL 151
#define STR_LABEL_LINEAR 160
#define STR_LABEL_LOGARITHMIC 161
#define STR_LABEL_POWER 162
#define STR_LABEL_REGRESSION_MODEL 170
#define STR_LABEL_RSQUARED 171
#define STR_LABEL_SLOPE 172
#define STR_LABEL_INTERCEPT 173
#define STR_FTEST_P_RIGHT_TAIL 200
#define STR_FTEST_F_CRITICAL_RIGHT_TAIL 201
#define STR_FTEST_P_LEFT_TAIL 202
#define STR_FTEST_F_CRITICAL_LEFT_TAIL 203
#define STR_FTEST_P_TWO_TAIL 204
#define STR_FTEST_F_CRITICAL_TWO_TAIL 205
#define STR_TTEST_PEARSON_CORRELATION 220
#define STR_TTEST_VARIANCE_OF_THE_DIFFERENCES 222
#define STR_TTEST_T_STAT 223
#define STR_TTEST_P_ONE_TAIL 224
#define STR_TTEST_T_CRITICAL_ONE_TAIL 225
#define STR_TTEST_P_TWO_TAIL 226
#define STR_TTEST_T_CRITICAL_TWO_TAIL 227
#define STR_ZTEST_KNOWN_VARIANCE 240
#define STR_ZTEST_Z_VALUE 241
#define STR_ZTEST_P_ONE_TAIL 242
#define STR_ZTEST_Z_CRITICAL_ONE_TAIL 243
#define STR_ZTEST_P_TWO_TAIL 244
#define STR_ZTEST_Z_CRITICAL_TWO_TAIL 245
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

650
sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
View File

@@ -8,475 +8,471 @@
* *
*/ */
#include "StatisticsDialogs.hrc" #include "sc.hrc"
Resource RID_STATISTICS_DLGS /* MovingAverageDialog */
String STR_MOVING_AVERAGE_UNDO_NAME
{ {
/* MovingAverageDialog */
String STR_MOVING_AVERAGE_UNDO_NAME
{
Text [ en-US ] = "Moving Average"; Text [ en-US ] = "Moving Average";
}; };
/* ExponentialSmoothingDialog */ /* ExponentialSmoothingDialog */
String STR_EXPONENTIAL_SMOOTHING_UNDO_NAME String STR_EXPONENTIAL_SMOOTHING_UNDO_NAME
{ {
Text [ en-US ] = "Exponential Smoothing"; Text [ en-US ] = "Exponential Smoothing";
}; };
/* AnalysisOfVarianceDialog */ /* AnalysisOfVarianceDialog */
String STR_ANALYSIS_OF_VARIANCE_UNDO_NAME String STR_ANALYSIS_OF_VARIANCE_UNDO_NAME
{ {
Text [ en-US ] = "Analysis of Variance"; Text [ en-US ] = "Analysis of Variance";
}; };
String STR_ANOVA_SINGLE_FACTOR_LABEL String STR_ANOVA_SINGLE_FACTOR_LABEL
{ {
Text [ en-US ] = "ANOVA - Single Factor"; Text [ en-US ] = "ANOVA - Single Factor";
}; };
String STR_ANOVA_TWO_FACTOR_LABEL String STR_ANOVA_TWO_FACTOR_LABEL
{ {
Text [ en-US ] = "ANOVA - Two Factor"; Text [ en-US ] = "ANOVA - Two Factor";
}; };
String STR_ANOVA_LABEL_GROUPS String STR_ANOVA_LABEL_GROUPS
{ {
Text [ en-US ] = "Groups"; Text [ en-US ] = "Groups";
}; };
String STR_ANOVA_LABEL_BETWEEN_GROUPS String STR_ANOVA_LABEL_BETWEEN_GROUPS
{ {
Text [ en-US ] = "Between Groups"; Text [ en-US ] = "Between Groups";
}; };
String STR_ANOVA_LABEL_WITHIN_GROUPS String STR_ANOVA_LABEL_WITHIN_GROUPS
{ {
Text [ en-US ] = "Within Groups"; Text [ en-US ] = "Within Groups";
}; };
String STR_ANOVA_LABEL_SOURCE_OF_VARIATION String STR_ANOVA_LABEL_SOURCE_OF_VARIATION
{ {
Text [ en-US ] = "Source of Variation"; Text [ en-US ] = "Source of Variation";
}; };
String STR_ANOVA_LABEL_SS String STR_ANOVA_LABEL_SS
{ {
Text [ en-US ] = "SS"; Text [ en-US ] = "SS";
}; };
String STR_ANOVA_LABEL_DF String STR_ANOVA_LABEL_DF
{ {
Text [ en-US ] = "df"; Text [ en-US ] = "df";
}; };
String STR_ANOVA_LABEL_MS String STR_ANOVA_LABEL_MS
{ {
Text [ en-US ] = "MS"; Text [ en-US ] = "MS";
}; };
String STR_ANOVA_LABEL_F String STR_ANOVA_LABEL_F
{ {
Text [ en-US ] = "F"; Text [ en-US ] = "F";
}; };
String STR_ANOVA_LABEL_P_VALUE String STR_ANOVA_LABEL_P_VALUE
{ {
Text [ en-US ] = "P-value"; Text [ en-US ] = "P-value";
}; };
String STR_ANOVA_LABEL_F_CRITICAL String STR_ANOVA_LABEL_F_CRITICAL
{ {
Text [ en-US ] = "F critical"; Text [ en-US ] = "F critical";
}; };
String STR_ANOVA_LABEL_TOTAL String STR_ANOVA_LABEL_TOTAL
{ {
Text [ en-US ] = "Total"; Text [ en-US ] = "Total";
}; };
/* CorrelationDialog */ /* CorrelationDialog */
String STR_CORRELATION_UNDO_NAME String STR_CORRELATION_UNDO_NAME
{ {
Text [ en-US ] = "Correlation"; Text [ en-US ] = "Correlation";
}; };
String STR_CORRELATION_LABEL String STR_CORRELATION_LABEL
{ {
Text [ en-US ] = "Correlations"; Text [ en-US ] = "Correlations";
}; };
/* CovarianceDialog */ /* CovarianceDialog */
String STR_COVARIANCE_UNDO_NAME String STR_COVARIANCE_UNDO_NAME
{ {
Text [ en-US ] = "Covariance"; Text [ en-US ] = "Covariance";
}; };
String STR_COVARIANCE_LABEL String STR_COVARIANCE_LABEL
{ {
Text [ en-US ] = "Covariances"; Text [ en-US ] = "Covariances";
}; };
/* DescriptiveStatisticsDialog */ /* DescriptiveStatisticsDialog */
String STR_DESCRIPTIVE_STATISTICS_UNDO_NAME String STR_DESCRIPTIVE_STATISTICS_UNDO_NAME
{ {
Text [ en-US ] = "Descriptive Statistics"; Text [ en-US ] = "Descriptive Statistics";
}; };
String STRID_CALC_MEAN String STRID_CALC_MEAN
{ {
Text [ en-US ] = "Mean"; Text [ en-US ] = "Mean";
}; };
String STRID_CALC_STD_ERROR String STRID_CALC_STD_ERROR
{ {
Text [ en-US ] = "Standard Error"; Text [ en-US ] = "Standard Error";
}; };
String STRID_CALC_MODE String STRID_CALC_MODE
{ {
Text [ en-US ] = "Mode"; Text [ en-US ] = "Mode";
}; };
String STRID_CALC_MEDIAN String STRID_CALC_MEDIAN
{ {
Text [ en-US ] = "Median"; Text [ en-US ] = "Median";
}; };
String STRID_CALC_VARIANCE String STRID_CALC_VARIANCE
{ {
Text [ en-US ] = "Variance"; Text [ en-US ] = "Variance";
}; };
String STRID_CALC_STD_DEVIATION String STRID_CALC_STD_DEVIATION
{ {
Text [ en-US ] = "Standard Deviation"; Text [ en-US ] = "Standard Deviation";
}; };
String STRID_CALC_KURTOSIS String STRID_CALC_KURTOSIS
{ {
Text [ en-US ] = "Kurtosis"; Text [ en-US ] = "Kurtosis";
}; };
String STRID_CALC_SKEWNESS String STRID_CALC_SKEWNESS
{ {
Text [ en-US ] = "Skewness"; Text [ en-US ] = "Skewness";
}; };
String STRID_CALC_RANGE String STRID_CALC_RANGE
{ {
Text [ en-US ] = "Range"; Text [ en-US ] = "Range";
}; };
String STRID_CALC_MIN String STRID_CALC_MIN
{ {
Text [ en-US ] = "Minimum"; Text [ en-US ] = "Minimum";
}; };
String STRID_CALC_MAX String STRID_CALC_MAX
{ {
Text [ en-US ] = "Maximum"; Text [ en-US ] = "Maximum";
}; };
String STRID_CALC_SUM String STRID_CALC_SUM
{ {
Text [ en-US ] = "Sum"; Text [ en-US ] = "Sum";
}; };
String STRID_CALC_COUNT String STRID_CALC_COUNT
{ {
Text [ en-US ] = "Count"; Text [ en-US ] = "Count";
}; };
String STRID_CALC_FIRST_QUARTILE String STRID_CALC_FIRST_QUARTILE
{ {
Text [ en-US ] = "First Quartile "; Text [ en-US ] = "First Quartile ";
}; };
String STRID_CALC_THIRD_QUARTILE String STRID_CALC_THIRD_QUARTILE
{ {
Text [ en-US ] = "Third Quartile"; Text [ en-US ] = "Third Quartile";
}; };
/* RandomNumberGeneratorDialog */ /* RandomNumberGeneratorDialog */
String STR_UNDO_DISTRIBUTION_TEMPLATE String STR_UNDO_DISTRIBUTION_TEMPLATE
{ {
Text [ en-US ] = "Random ($(DISTRIBUTION))"; Text [ en-US ] = "Random ($(DISTRIBUTION))";
}; };
String STR_DISTRIBUTION_UNIFORM_REAL String STR_DISTRIBUTION_UNIFORM_REAL
{ {
Text [ en-US ] = "Uniform"; Text [ en-US ] = "Uniform";
}; };
String STR_DISTRIBUTION_UNIFORM_INTEGER String STR_DISTRIBUTION_UNIFORM_INTEGER
{ {
Text [ en-US ] = "Uniform Integer"; Text [ en-US ] = "Uniform Integer";
}; };
String STR_DISTRIBUTION_NORMAL String STR_DISTRIBUTION_NORMAL
{ {
Text [ en-US ] = "Normal"; Text [ en-US ] = "Normal";
}; };
String STR_DISTRIBUTION_CAUCHY String STR_DISTRIBUTION_CAUCHY
{ {
Text [ en-US ] = "Cauchy"; Text [ en-US ] = "Cauchy";
}; };
String STR_DISTRIBUTION_BERNOULLI String STR_DISTRIBUTION_BERNOULLI
{ {
Text [ en-US ] = "Bernoulli"; Text [ en-US ] = "Bernoulli";
}; };
String STR_DISTRIBUTION_BINOMIAL String STR_DISTRIBUTION_BINOMIAL
{ {
Text [ en-US ] = "Binomial"; Text [ en-US ] = "Binomial";
}; };
String STR_DISTRIBUTION_NEGATIVE_BINOMIAL String STR_DISTRIBUTION_NEGATIVE_BINOMIAL
{ {
Text [ en-US ] = "Negative Binomial"; Text [ en-US ] = "Negative Binomial";
}; };
String STR_DISTRIBUTION_CHI_SQUARED String STR_DISTRIBUTION_CHI_SQUARED
{ {
Text [ en-US ] = "Chi Squared"; Text [ en-US ] = "Chi Squared";
}; };
String STR_DISTRIBUTION_GEOMETRIC String STR_DISTRIBUTION_GEOMETRIC
{ {
Text [ en-US ] = "Geometric"; Text [ en-US ] = "Geometric";
}; };
String STR_RNG_PARAMETER_MINIMUM String STR_RNG_PARAMETER_MINIMUM
{ {
Text [ en-US ] = "Minimum"; Text [ en-US ] = "Minimum";
}; };
String STR_RNG_PARAMETER_MAXIMUM String STR_RNG_PARAMETER_MAXIMUM
{ {
Text [ en-US ] = "Maximum"; Text [ en-US ] = "Maximum";
}; };
String STR_RNG_PARAMETER_MEAN String STR_RNG_PARAMETER_MEAN
{ {
Text [ en-US ] = "Mean"; Text [ en-US ] = "Mean";
}; };
String STR_RNG_PARAMETER_STANDARD_DEVIATION String STR_RNG_PARAMETER_STANDARD_DEVIATION
{ {
Text [ en-US ] = "Standard Deviation"; Text [ en-US ] = "Standard Deviation";
}; };
String STR_RNG_PARAMETER_STANDARD_MEDIAN String STR_RNG_PARAMETER_STANDARD_MEDIAN
{ {
Text [ en-US ] = "Median"; Text [ en-US ] = "Median";
}; };
String STR_RNG_PARAMETER_STANDARD_SIGMA String STR_RNG_PARAMETER_STANDARD_SIGMA
{ {
Text [ en-US ] = "Sigma"; Text [ en-US ] = "Sigma";
}; };
String STR_RNG_PARAMETER_STANDARD_PROBABILITY String STR_RNG_PARAMETER_STANDARD_PROBABILITY
{ {
Text [ en-US ] = "p Value"; Text [ en-US ] = "p Value";
}; };
String STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS String STR_RNG_PARAMETER_STANDARD_NUMBER_OF_TRIALS
{ {
Text [ en-US ] = "Number of Trials"; Text [ en-US ] = "Number of Trials";
}; };
String STR_RNG_PARAMETER_STANDARD_NU_VALUE String STR_RNG_PARAMETER_STANDARD_NU_VALUE
{ {
Text [ en-US ] = "nu Value"; Text [ en-US ] = "nu Value";
}; };
/* SamplingDialog */ /* SamplingDialog */
String STR_SAMPLING_UNDO_NAME String STR_SAMPLING_UNDO_NAME
{ {
Text [ en-US ] = "Sampling"; Text [ en-US ] = "Sampling";
}; };
/* Names of dialogs */ /* Names of dialogs */
String STR_FTEST String STR_FTEST
{ {
Text [ en-US ] = "F-test"; Text [ en-US ] = "F-test";
}; };
String STR_FTEST_UNDO_NAME String STR_FTEST_UNDO_NAME
{ {
Text [ en-US ] = "F-test"; Text [ en-US ] = "F-test";
}; };
String STR_TTEST String STR_TTEST
{ {
Text [ en-US ] = "t-test"; Text [ en-US ] = "t-test";
}; };
String STR_TTEST_UNDO_NAME String STR_TTEST_UNDO_NAME
{ {
Text [ en-US ] = "t-test"; Text [ en-US ] = "t-test";
}; };
String STR_ZTEST String STR_ZTEST
{ {
Text [ en-US ] = "z-test"; Text [ en-US ] = "z-test";
}; };
String STR_ZTEST_UNDO_NAME String STR_ZTEST_UNDO_NAME
{ {
Text [ en-US ] = "z-test"; Text [ en-US ] = "z-test";
}; };
String STR_CHI_SQUARE_TEST String STR_CHI_SQUARE_TEST
{ {
Text [ en-US ] = "Test of Independence (Chi-Square)"; Text [ en-US ] = "Test of Independence (Chi-Square)";
}; };
String STR_REGRESSION_UNDO_NAME String STR_REGRESSION_UNDO_NAME
{ {
Text [ en-US ] = "Regression"; Text [ en-US ] = "Regression";
}; };
String STR_REGRESSION String STR_REGRESSION
{ {
Text [ en-US ] = "Regression"; Text [ en-US ] = "Regression";
}; };
/* Common */ /* Common */
String STR_COLUMN_LABEL_TEMPLATE String STR_COLUMN_LABEL_TEMPLATE
{ {
Text [ en-US ] = "Column %NUMBER%"; Text [ en-US ] = "Column %NUMBER%";
}; };
String STR_ROW_LABEL_TEMPLATE String STR_ROW_LABEL_TEMPLATE
{ {
Text [ en-US ] = "Row %NUMBER%"; Text [ en-US ] = "Row %NUMBER%";
}; };
String STR_LABEL_ALPHA String STR_LABEL_ALPHA
{ {
Text [ en-US ] = "Alpha"; Text [ en-US ] = "Alpha";
}; };
String STR_VARIABLE_1_LABEL String STR_VARIABLE_1_LABEL
{ {
Text [ en-US ] = "Variable 1"; Text [ en-US ] = "Variable 1";
}; };
String STR_VARIABLE_2_LABEL String STR_VARIABLE_2_LABEL
{ {
Text [ en-US ] = "Variable 2"; Text [ en-US ] = "Variable 2";
}; };
String STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL String STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL
{ {
Text [ en-US ] = "Hypothesized Mean Difference"; Text [ en-US ] = "Hypothesized Mean Difference";
}; };
String STR_OBSERVATIONS_LABEL String STR_OBSERVATIONS_LABEL
{ {
Text [ en-US ] = "Observations"; Text [ en-US ] = "Observations";
}; };
String STR_OBSERVED_MEAN_DIFFERENCE_LABEL String STR_OBSERVED_MEAN_DIFFERENCE_LABEL
{ {
Text [ en-US ] = "Observed Mean Difference"; Text [ en-US ] = "Observed Mean Difference";
}; };
String STR_DEGREES_OF_FREEDOM_LABEL String STR_DEGREES_OF_FREEDOM_LABEL
{ {
Text [ en-US ] = "df"; Text [ en-US ] = "df";
}; };
String STR_P_VALUE_LABEL String STR_P_VALUE_LABEL
{ {
Text [ en-US ] = "P-value"; Text [ en-US ] = "P-value";
}; };
String STR_CRITICAL_VALUE_LABEL String STR_CRITICAL_VALUE_LABEL
{ {
Text [ en-US ] = "Critical Value"; Text [ en-US ] = "Critical Value";
}; };
String STR_TEST_STATISTIC_LABEL String STR_TEST_STATISTIC_LABEL
{ {
Text [ en-US ] = "Test Statistic"; Text [ en-US ] = "Test Statistic";
}; };
/* RegressionDialog */ /* RegressionDialog */
String STR_LABEL_LINEAR String STR_LABEL_LINEAR
{ {
Text [ en-US ] = "Linear"; Text [ en-US ] = "Linear";
}; };
String STR_LABEL_LOGARITHMIC String STR_LABEL_LOGARITHMIC
{ {
Text [ en-US ] = "Logarithmic"; Text [ en-US ] = "Logarithmic";
}; };
String STR_LABEL_POWER String STR_LABEL_POWER
{ {
Text [ en-US ] = "Power"; Text [ en-US ] = "Power";
}; };
String STR_LABEL_REGRESSION_MODEL String STR_LABEL_REGRESSION_MODEL
{ {
Text [ en-US ] = "Regression Model"; Text [ en-US ] = "Regression Model";
}; };
String STR_LABEL_RSQUARED String STR_LABEL_RSQUARED
{ {
Text [ en-US ] = "R^2"; Text [ en-US ] = "R^2";
}; };
String STR_LABEL_SLOPE String STR_LABEL_SLOPE
{ {
Text [ en-US ] = "Slope"; Text [ en-US ] = "Slope";
}; };
String STR_LABEL_INTERCEPT String STR_LABEL_INTERCEPT
{ {
Text [ en-US ] = "Intercept"; Text [ en-US ] = "Intercept";
}; };
/*F Test */ /*F Test */
String STR_FTEST_P_RIGHT_TAIL String STR_FTEST_P_RIGHT_TAIL
{ {
Text [ en-US ] = "P (F<=f) right-tail"; Text [ en-US ] = "P (F<=f) right-tail";
}; };
String STR_FTEST_F_CRITICAL_RIGHT_TAIL String STR_FTEST_F_CRITICAL_RIGHT_TAIL
{ {
Text [ en-US ] = "F Critical right-tail"; Text [ en-US ] = "F Critical right-tail";
}; };
String STR_FTEST_P_LEFT_TAIL String STR_FTEST_P_LEFT_TAIL
{ {
Text [ en-US ] = "P (F<=f) left-tail"; Text [ en-US ] = "P (F<=f) left-tail";
}; };
String STR_FTEST_F_CRITICAL_LEFT_TAIL String STR_FTEST_F_CRITICAL_LEFT_TAIL
{ {
Text [ en-US ] = "F Critical left-tail"; Text [ en-US ] = "F Critical left-tail";
}; };
String STR_FTEST_P_TWO_TAIL String STR_FTEST_P_TWO_TAIL
{ {
Text [ en-US ] = "P two-tail"; Text [ en-US ] = "P two-tail";
}; };
String STR_FTEST_F_CRITICAL_TWO_TAIL String STR_FTEST_F_CRITICAL_TWO_TAIL
{ {
Text [ en-US ] = "F Critical two-tail"; Text [ en-US ] = "F Critical two-tail";
}; };
/*t Test*/ /*t Test*/
String STR_TTEST_PEARSON_CORRELATION String STR_TTEST_PEARSON_CORRELATION
{ {
Text [ en-US ] = "Pearson Correlation"; Text [ en-US ] = "Pearson Correlation";
}; };
String STR_TTEST_VARIANCE_OF_THE_DIFFERENCES String STR_TTEST_VARIANCE_OF_THE_DIFFERENCES
{ {
Text [ en-US ] = "Variance of the Differences"; Text [ en-US ] = "Variance of the Differences";
}; };
String STR_TTEST_T_STAT String STR_TTEST_T_STAT
{ {
Text [ en-US ] = "t Stat"; Text [ en-US ] = "t Stat";
}; };
String STR_TTEST_P_ONE_TAIL String STR_TTEST_P_ONE_TAIL
{ {
Text [ en-US ] = "P (T<=t) one-tail"; Text [ en-US ] = "P (T<=t) one-tail";
}; };
String STR_TTEST_T_CRITICAL_ONE_TAIL String STR_TTEST_T_CRITICAL_ONE_TAIL
{ {
Text [ en-US ] = "t Critical one-tail"; Text [ en-US ] = "t Critical one-tail";
}; };
String STR_TTEST_P_TWO_TAIL String STR_TTEST_P_TWO_TAIL
{ {
Text [ en-US ] = "P (T<=t) two-tail"; Text [ en-US ] = "P (T<=t) two-tail";
}; };
String STR_TTEST_T_CRITICAL_TWO_TAIL String STR_TTEST_T_CRITICAL_TWO_TAIL
{ {
Text [ en-US ] = "t Critical two-tail"; Text [ en-US ] = "t Critical two-tail";
}; };
/*Z Test*/ /*Z Test*/
String STR_ZTEST_Z_VALUE String STR_ZTEST_Z_VALUE
{ {
Text [ en-US ] = "z"; Text [ en-US ] = "z";
}; };
String STR_ZTEST_KNOWN_VARIANCE String STR_ZTEST_KNOWN_VARIANCE
{ {
Text [ en-US ] = "Known Variance"; Text [ en-US ] = "Known Variance";
}; };
String STR_ZTEST_P_ONE_TAIL String STR_ZTEST_P_ONE_TAIL
{ {
Text [ en-US ] = "P (Z<=z) one-tail"; Text [ en-US ] = "P (Z<=z) one-tail";
}; };
String STR_ZTEST_Z_CRITICAL_ONE_TAIL String STR_ZTEST_Z_CRITICAL_ONE_TAIL
{ {
Text [ en-US ] = "z Critical one-tail"; Text [ en-US ] = "z Critical one-tail";
}; };
String STR_ZTEST_P_TWO_TAIL String STR_ZTEST_P_TWO_TAIL
{ {
Text [ en-US ] = "P (Z<=z) two-tail"; Text [ en-US ] = "P (Z<=z) two-tail";
}; };
String STR_ZTEST_Z_CRITICAL_TWO_TAIL String STR_ZTEST_Z_CRITICAL_TWO_TAIL
{ {
Text [ en-US ] = "z Critical two-tail"; Text [ en-US ] = "z Critical two-tail";
};
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
View File

@@ -284,7 +284,7 @@ IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, RefInputModifyHandler, Edit&, vo
void ScStatisticsInputOutputDialog::CalculateInputAndWriteToOutput() void ScStatisticsInputOutputDialog::CalculateInputAndWriteToOutput()
{ {
OUString aUndo(SC_STRLOAD(RID_STATISTICS_DLGS, GetUndoNameId())); OUString aUndo(SC_RESSTR(GetUndoNameId()));
ScDocShell* pDocShell = mViewData->GetDocShell(); ScDocShell* pDocShell = mViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager(); svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() ); pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() );

2
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
View File

@@ -323,7 +323,7 @@ IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, RefInputModifyHandler, Edit&, vo
void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput() void ScStatisticsTwoVariableDialog::CalculateInputAndWriteToOutput()
{ {
OUString aUndo(SC_STRLOAD(RID_STATISTICS_DLGS, GetUndoNameId())); OUString aUndo(SC_RESSTR(GetUndoNameId()));
ScDocShell* pDocShell = mViewData->GetDocShell(); ScDocShell* pDocShell = mViewData->GetDocShell();
svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager(); svl::IUndoManager* pUndoManager = pDocShell->GetUndoManager();
pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() ); pUndoManager->EnterListAction( aUndo, aUndo, 0, mViewData->GetViewShell()->GetViewShellId() );

37
sc/source/ui/StatisticsDialogs/TTestDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "TTestDialog.hxx" #include "TTestDialog.hxx"
@@ -33,7 +32,7 @@ ScTTestDialog::ScTTestDialog(
pSfxBindings, pChildWindow, pParent, pViewData, pSfxBindings, pChildWindow, pParent, pViewData,
"TTestDialog", "modules/scalc/ui/ttestdialog.ui" ) "TTestDialog", "modules/scalc/ui/ttestdialog.ui" )
{ {
SetText(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST)); SetText(SC_RESSTR(STR_TTEST));
} }
ScTTestDialog::~ScTTestDialog() ScTTestDialog::~ScTTestDialog()
@@ -70,30 +69,30 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_UNDO_NAME)); aOutput.writeBoldString(SC_RESSTR(STR_TTEST_UNDO_NAME));
aOutput.newLine(); aOutput.newLine();
// Alpha // Alpha
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_ALPHA)); aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeValue(0.05); aOutput.writeValue(0.05);
aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current()); aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
// Hypothesized mean difference // Hypothesized mean difference
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL)); aOutput.writeString(SC_RESSTR(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeValue(0); aOutput.writeValue(0);
aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current()); aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_VARIABLE_1_LABEL)); aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_VARIABLE_2_LABEL)); aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_MEAN)); aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)"); aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -102,7 +101,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_VARIANCE)); aOutput.writeString(SC_RESSTR(STRID_CALC_VARIANCE));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)"); aTemplate.setTemplate("=VAR(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -112,7 +111,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// Observations // Observations
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL)); aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)"); aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -122,14 +121,14 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// Pearson Correlation // Pearson Correlation
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_PEARSON_CORRELATION)); aOutput.writeString(SC_RESSTR(STR_TTEST_PEARSON_CORRELATION));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=CORREL(%VARIABLE1_RANGE%;%VARIABLE2_RANGE%)"); aTemplate.setTemplate("=CORREL(%VARIABLE1_RANGE%;%VARIABLE2_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// Observed mean difference // Observed mean difference
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVED_MEAN_DIFFERENCE_LABEL)); aOutput.writeString(SC_RESSTR(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))"); aTemplate.setTemplate("=AVERAGE(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))");
aOutput.writeMatrixFormula(aTemplate.getTemplate()); aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -137,7 +136,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// Variance of the Differences // Variance of the Differences
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_VARIANCE_OF_THE_DIFFERENCES)); aOutput.writeString(SC_RESSTR(STR_TTEST_VARIANCE_OF_THE_DIFFERENCES));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=VAR(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))"); aTemplate.setTemplate("=VAR(IF(ISODD(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)); %VARIABLE1_RANGE% - %VARIABLE2_RANGE%; \"NA\"))");
aOutput.writeMatrixFormula(aTemplate.getTemplate()); aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -145,7 +144,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// df // df
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ANOVA_LABEL_DF)); aOutput.writeString(SC_RESSTR(STR_ANOVA_LABEL_DF));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=SUM(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)) - 1"); aTemplate.setTemplate("=SUM(IF(ISNUMBER(%VARIABLE1_RANGE%); 1; 0) * IF(ISNUMBER(%VARIABLE2_RANGE%); 1; 0)) - 1");
aOutput.writeMatrixFormula(aTemplate.getTemplate()); aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -153,7 +152,7 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// t stat // t stat
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_T_STAT)); aOutput.writeString(SC_RESSTR(STR_TTEST_T_STAT));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=(%OBSERVED_MEAN_DIFFERENCE% - %HYPOTHESIZED_MEAN_DIFFERENCE%) / (%VARIANCE_OF_DIFFERENCES% / ( %DEGREE_OF_FREEDOM% + 1)) ^ 0.5"); aTemplate.setTemplate("=(%OBSERVED_MEAN_DIFFERENCE% - %HYPOTHESIZED_MEAN_DIFFERENCE%) / (%VARIANCE_OF_DIFFERENCES% / ( %DEGREE_OF_FREEDOM% + 1)) ^ 0.5");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -161,28 +160,28 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// P one-tail // P one-tail
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_P_ONE_TAIL)); aOutput.writeString(SC_RESSTR(STR_TTEST_P_ONE_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=TDIST(ABS(%T_STAT%); %DEGREE_OF_FREEDOM%; 1)"); aTemplate.setTemplate("=TDIST(ABS(%T_STAT%); %DEGREE_OF_FREEDOM%; 1)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// T critical one-tail // T critical one-tail
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_T_CRITICAL_ONE_TAIL)); aOutput.writeString(SC_RESSTR(STR_TTEST_T_CRITICAL_ONE_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=TINV(2*%ALPHA%; %DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=TINV(2*%ALPHA%; %DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// P two-tail // P two-tail
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_P_TWO_TAIL)); aOutput.writeString(SC_RESSTR(STR_TTEST_P_TWO_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=TDIST(ABS(%T_STAT%); %DEGREE_OF_FREEDOM%; 2)"); aTemplate.setTemplate("=TDIST(ABS(%T_STAT%); %DEGREE_OF_FREEDOM%; 2)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// T critical two-tail // T critical two-tail
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_T_CRITICAL_TWO_TAIL)); aOutput.writeString(SC_RESSTR(STR_TTEST_T_CRITICAL_TWO_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=TINV(%ALPHA%; %DEGREE_OF_FREEDOM%)"); aTemplate.setTemplate("=TINV(%ALPHA%; %DEGREE_OF_FREEDOM%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());

31
sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
View File

@@ -21,7 +21,6 @@
#include "reffact.hxx" #include "reffact.hxx"
#include "strload.hxx" #include "strload.hxx"
#include "docfunc.hxx" #include "docfunc.hxx"
#include "StatisticsDialogs.hrc"
#include "TableFillingAndNavigationTools.hxx" #include "TableFillingAndNavigationTools.hxx"
#include "ZTestDialog.hxx" #include "ZTestDialog.hxx"
@@ -33,7 +32,7 @@ ScZTestDialog::ScZTestDialog(
pSfxBindings, pChildWindow, pParent, pViewData, pSfxBindings, pChildWindow, pParent, pViewData,
"ZTestDialog", "modules/scalc/ui/ztestdialog.ui" ) "ZTestDialog", "modules/scalc/ui/ztestdialog.ui" )
{ {
SetText(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ZTEST)); SetText(SC_RESSTR(STR_ZTEST));
} }
ScZTestDialog::~ScZTestDialog() ScZTestDialog::~ScZTestDialog()
@@ -70,18 +69,18 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE1_RANGE%", pVariable1Iterator->get());
aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get()); aTemplate.autoReplaceRange("%VARIABLE2_RANGE%", pVariable2Iterator->get());
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ZTEST)); aOutput.writeBoldString(SC_RESSTR(STR_ZTEST));
aOutput.newLine(); aOutput.newLine();
// Alpha // Alpha
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_LABEL_ALPHA)); aOutput.writeString(SC_RESSTR(STR_LABEL_ALPHA));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeValue(0.05); aOutput.writeValue(0.05);
aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current()); aTemplate.autoReplaceAddress("%ALPHA%", aOutput.current());
aOutput.newLine(); aOutput.newLine();
// Hypothesized mean difference // Hypothesized mean difference
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL)); aOutput.writeString(SC_RESSTR(STR_HYPOTHESIZED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeValue(0); aOutput.writeValue(0);
aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current()); aTemplate.autoReplaceAddress("%HYPOTHESIZED_MEAN_DIFFERENCE%", aOutput.current());
@@ -89,13 +88,13 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
// Variable Label // Variable Label
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_VARIABLE_1_LABEL)); aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_1_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_VARIABLE_2_LABEL)); aOutput.writeBoldString(SC_RESSTR(STR_VARIABLE_2_LABEL));
aOutput.newLine(); aOutput.newLine();
// Known Variance // Known Variance
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ZTEST_KNOWN_VARIANCE)); aOutput.writeString(SC_RESSTR(STR_ZTEST_KNOWN_VARIANCE));
aOutput.nextColumn(); aOutput.nextColumn();
aOutput.writeValue(0); aOutput.writeValue(0);
aTemplate.autoReplaceAddress("%KNOWN_VARIANCE_VARIABLE1%", aOutput.current()); aTemplate.autoReplaceAddress("%KNOWN_VARIANCE_VARIABLE1%", aOutput.current());
@@ -105,7 +104,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// Mean // Mean
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STRID_CALC_MEAN)); aOutput.writeString(SC_RESSTR(STRID_CALC_MEAN));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)"); aTemplate.setTemplate("=AVERAGE(%VARIABLE1_RANGE%)");
aTemplate.autoReplaceAddress("%MEAN_VARIABLE1%", aOutput.current()); aTemplate.autoReplaceAddress("%MEAN_VARIABLE1%", aOutput.current());
@@ -117,7 +116,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// Observations // Observations
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVATIONS_LABEL)); aOutput.writeString(SC_RESSTR(STR_OBSERVATIONS_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)"); aTemplate.setTemplate("=COUNT(%VARIABLE1_RANGE%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -129,7 +128,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// Observed mean difference // Observed mean difference
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_OBSERVED_MEAN_DIFFERENCE_LABEL)); aOutput.writeString(SC_RESSTR(STR_OBSERVED_MEAN_DIFFERENCE_LABEL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=%MEAN_VARIABLE1% - %MEAN_VARIABLE2%"); aTemplate.setTemplate("=%MEAN_VARIABLE1% - %MEAN_VARIABLE2%");
aOutput.writeMatrixFormula(aTemplate.getTemplate()); aOutput.writeMatrixFormula(aTemplate.getTemplate());
@@ -137,7 +136,7 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// z // z
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ZTEST_Z_VALUE)); aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_VALUE));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=(%OBSERVED_MEAN_DIFFERENCE% - %HYPOTHESIZED_MEAN_DIFFERENCE%) / SQRT( %KNOWN_VARIANCE_VARIABLE1% / %OBSERVATION_VARIABLE1% + %KNOWN_VARIANCE_VARIABLE2% / %OBSERVATION_VARIABLE2% )"); aTemplate.setTemplate("=(%OBSERVED_MEAN_DIFFERENCE% - %HYPOTHESIZED_MEAN_DIFFERENCE%) / SQRT( %KNOWN_VARIANCE_VARIABLE1% / %OBSERVATION_VARIABLE1% + %KNOWN_VARIANCE_VARIABLE2% / %OBSERVATION_VARIABLE2% )");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
@@ -145,28 +144,28 @@ ScRange ScZTestDialog::ApplyOutput(ScDocShell* pDocShell)
aOutput.newLine(); aOutput.newLine();
// P one-tail // P one-tail
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ZTEST_P_ONE_TAIL)); aOutput.writeString(SC_RESSTR(STR_ZTEST_P_ONE_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=1 - NORMSDIST(ABS(%Z_STAT%))"); aTemplate.setTemplate("=1 - NORMSDIST(ABS(%Z_STAT%))");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// z critical one-tail // z critical one-tail
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ZTEST_Z_CRITICAL_ONE_TAIL)); aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_CRITICAL_ONE_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=-NORMSINV(%ALPHA%)"); aTemplate.setTemplate("=-NORMSINV(%ALPHA%)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// P two-tail // P two-tail
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ZTEST_P_TWO_TAIL)); aOutput.writeString(SC_RESSTR(STR_ZTEST_P_TWO_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=2 * NORMSDIST(-ABS(%Z_STAT%))"); aTemplate.setTemplate("=2 * NORMSDIST(-ABS(%Z_STAT%))");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());
aOutput.newLine(); aOutput.newLine();
// z critical two-tail // z critical two-tail
aOutput.writeString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_ZTEST_Z_CRITICAL_TWO_TAIL)); aOutput.writeString(SC_RESSTR(STR_ZTEST_Z_CRITICAL_TWO_TAIL));
aOutput.nextColumn(); aOutput.nextColumn();
aTemplate.setTemplate("=-NORMSINV(%ALPHA%/2)"); aTemplate.setTemplate("=-NORMSINV(%ALPHA%/2)");
aOutput.writeFormula(aTemplate.getTemplate()); aOutput.writeFormula(aTemplate.getTemplate());