[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source

[Markus Mohrhard]

 sc/qa/unit/data/contentCSV/statistical-functions.csv |    1 +
 sc/qa/unit/data/ods/functions.ods                    |binary
 sc/qa/unit/subsequent_filters-test.cxx               |    3 +++
 sc/source/core/tool/interpr6.cxx                     |    2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 68cd5c4fa1b6190907ef4a121bac5d5eff0c13ec
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Dec 26 00:09:45 2013 +0100

    add test case for fdo#72999
    
    Change-Id: I256e0cb228edb85b402e6645fd40f24b7ccf234a

diff --git a/sc/qa/unit/data/contentCSV/statistical-functions.csv b/sc/qa/unit/data/contentCSV/statistical-functions.csv
new file mode 100644
index 0000000..e4e9574
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/statistical-functions.csv
@@ -0,0 +1 @@
+1,1,2,0,3,3
diff --git a/sc/qa/unit/data/ods/functions.ods b/sc/qa/unit/data/ods/functions.ods
index c3e2a34..9a1cb46 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and b/sc/qa/unit/data/ods/functions.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index c036318..747fd66 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -373,6 +373,9 @@ void ScFiltersTest::testFunctionsODS()
     // text functions
     createCSVPath(OUString("text-functions."), aCSVFileName);
     testFile(aCSVFileName, pDoc, 4);
+    // statistical functions
+    createCSVPath(OUString("statistical-functions."), aCSVFileName);
+    testFile(aCSVFileName, pDoc, 5);
 
     xDocSh->DoClose();
 }
commit 5bb8a2868316a644646857047be032c17787cac5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Dec 25 23:50:40 2013 +0100

    fix handling of range parameters in COUNT, fdo#72999
    
    Change-Id: I352c6b415f0990890702fa21175c196d7f4b12ee

diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index 8999e04..f404561 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -973,7 +973,7 @@ void ScInterpreter::ScCount()
 
                 FuncCount aAction;
                 aSet.executeColumnAction(*pDok, aAction);
-                nCount = aAction.getCount();
+                nCount += aAction.getCount();
 
                 // Get the number format of the last iterated cell.
                 nFuncFmtIndex = aAction.getNumberFormat();