From 0153ea7e11e5e67d272dfb3630e3ea7cc4d99df9 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Tue, 23 Jul 2013 22:59:31 +0200 Subject: Fix compiler errors and warnings.. Change-Id: Id35cdec02c7a5175e1b429b723679541292ddfb3 --- .../StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx') diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index cb00bac05615..2c7325ab7f81 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -35,14 +35,14 @@ static const char* lclBasicStatisticsLabels[] = "Groups", "Count", "Sum", "Mean", "Variance", NULL }; -static const char* lclAnovaLabels[] = +static const char* lclBasicStatisticsFormula[] = { - "Source of Variation", "SS", "df", "MS", "F", "P-value", "F critical", NULL + "=COUNT(%RANGE%)", "=SUM(%RANGE%)", "=AVERAGE(%RANGE%)", "=VAR(%RANGE%)", NULL }; -static const char* lclAnovaFormula[] = +static const char* lclAnovaLabels[] = { - "=COUNT(%RANGE%)", "=SUM(%RANGE%)", "=AVERAGE(%RANGE%)", "=VAR(%RANGE%)", NULL + "Source of Variation", "SS", "df", "MS", "F", "P-value", "F critical", NULL }; static const OUString lclWildcardRange("%RANGE%"); @@ -65,16 +65,6 @@ OUString lclCreateMultiParameterFormula( return aResult; } -class CellAddressIterator -{ -public: - CellAddressIterator(ScAddress& aStartAddress) - {} - - virtual ~CellAddressIterator() - {} -}; - } ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog( @@ -147,10 +137,10 @@ void ScAnalysisOfVarianceDialog::CalculateInputAndWriteToOutput( ) OUString aFormulaString; OUString aFormulaTemplate; - for(sal_Int32 i = 0; lclAnovaFormula[i] != NULL; i++) + for(sal_Int32 i = 0; lclBasicStatisticsFormula[i] != NULL; i++) { aAddress = ScAddress(outCol, outRow, outTab); - aFormulaTemplate = OUString::createFromAscii(lclAnovaFormula[i]); + aFormulaTemplate = OUString::createFromAscii(lclBasicStatisticsFormula[i]); aFormulaString = aFormulaTemplate.replaceAll(lclWildcardRange, aReferenceString); pDocShell->GetDocFunc().SetFormulaCell(aAddress, new ScFormulaCell(mDocument, aAddress, aFormulaString), true); outCol++; -- cgit