[Libreoffice-commits] core.git: include/svtools sc/source svx/source

[Tomaž Vajngerl]

 include/svtools/ruler.hxx                                   |    2 -
 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx |   22 +++---------
 svx/source/dialog/svxruler.cxx                              |    4 +-
 3 files changed, 9 insertions(+), 19 deletions(-)

New commits:
commit 0153ea7e11e5e67d272dfb3630e3ea7cc4d99df9
Author: Tomaž Vajngerl <quikee at gmail.com>
Date:   Tue Jul 23 22:59:31 2013 +0200

    Fix compiler errors and warnings..
    
    Change-Id: Id35cdec02c7a5175e1b429b723679541292ddfb3

diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 4c08745..04237df 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -693,7 +693,7 @@ private:
 
 protected:
     long GetRulerVirHeight() const;
-    MapMode GetMapMode() const { return maMapMode; }
+    MapMode GetCurrentMapMode() const { return maMapMode; }
     RulerUnitData GetCurrentRulerUnit() const;
 
 public:
diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index cb00bac..2c7325a 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++;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index ff87c51..d5ab943 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -436,10 +436,10 @@ SvxRuler::~SvxRuler()
 
 void SvxRuler::NormalizePosition(long& rValue) const
 {
-    long aNewPositionLogic = pEditWin->PixelToLogic(Size(0, rValue), GetMapMode()).Height();
+    long aNewPositionLogic = pEditWin->PixelToLogic(Size(0, rValue), GetCurrentMapMode()).Height();
     long aTickDivider = GetCurrentRulerUnit().nTick1;
     aNewPositionLogic = (aNewPositionLogic / aTickDivider) * aTickDivider;
-    rValue = pEditWin->LogicToPixel(Size(0, aNewPositionLogic), GetMapMode()).Height();
+    rValue = pEditWin->LogicToPixel(Size(0, aNewPositionLogic), GetCurrentMapMode()).Height();
 }
 
 long SvxRuler::ConvertHPosPixel(long nVal) const