summaryrefslogtreecommitdiff
path: root/sc/qa/unit/ucalc.cxx
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-06-26 20:51:22 +0200
committerEike Rathke <erack@redhat.com>2012-06-26 21:07:44 +0200
commitd822c6afe6c1a676e9b86d67e599dbcf75512a7c (patch)
treebdf143cc1a45fdab04c3354253f7044621a6db8e /sc/qa/unit/ucalc.cxx
parent5f86b4be3c40180031aa723f5fa44a19595bffa8 (diff)
resolved fdo#51442 N() inconsistent argument handling
5743e7b36220e9689091812cef7a4396dd48c4e6 introduced a different handling of arguments in the N() spreadsheet function. That lost the ability to use position dependent range intersections and suppressed every error instead of propagating it. Previous versions suppressed only the #N/A error. Excel propagates all errors instead. Note that Excel for N() does not use position dependent range intersection (SingleRef of DoubleRef) when a range reference is passed and does not handle evaluation in array context (instead top left value is always used), which both is inconsistent with other functions taking a scalar value parameter. ODFF does not specify this function different. This change re-enables range intersection and adds array evaluation. Gnumeric does the same. Change-Id: Ice35271e40f1a27cea384226e25945108003841a
Diffstat (limited to 'sc/qa/unit/ucalc.cxx')
-rw-r--r--sc/qa/unit/ucalc.cxx32
1 files changed, 22 insertions, 10 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 1db6294caec1..a86a3a0bcfd0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -433,25 +433,37 @@ void testFuncN(ScDocument* pDoc)
pDoc->SetString(1, 13, 0, OUString("=N(\"foo\")"));
// Range references
- pDoc->SetString(1, 14, 0, OUString("=N(A1:A8)"));
- pDoc->SetString(1, 15, 0, OUString("=N(A4:B8)"));
- pDoc->SetString(1, 16, 0, OUString("=N(A6:B8)"));
- pDoc->SetString(1, 17, 0, OUString("=N(A2:B8)"));
+ pDoc->SetString(2, 2, 0, OUString("=N(A1:A8)"));
+ pDoc->SetString(2, 3, 0, OUString("=N(A1:A8)"));
+ pDoc->SetString(2, 4, 0, OUString("=N(A1:A8)"));
+ pDoc->SetString(2, 5, 0, OUString("=N(A1:A8)"));
// Calculate and check the results.
pDoc->CalcAll();
- double checks[] = {
+ double checks1[] = {
0, 0, 0, 1, -1, 12.3, 0, // cell reference
- 0, 1, -1, 123, 0, 0, 0, // in-line values
- 0, 1, 12.3, 0 // range references
+ 0, 1, -1, 123, 0, 0, 0 // in-line values
};
- for (size_t i = 0; i < SAL_N_ELEMENTS(checks); ++i)
+ for (size_t i = 0; i < SAL_N_ELEMENTS(checks1); ++i)
{
pDoc->GetValue(1, i, 0, result);
- bool bGood = result == checks[i];
+ bool bGood = result == checks1[i];
if (!bGood)
{
- cerr << "row " << (i+1) << ": expected=" << checks[i] << " actual=" << result << endl;
+ cerr << "row " << (i+1) << ": expected=" << checks1[i] << " actual=" << result << endl;
+ CPPUNIT_ASSERT_MESSAGE("Unexpected result for N", false);
+ }
+ }
+ double checks2[] = {
+ 0, 1, -1, 12.3 // range references
+ };
+ for (size_t i = 0; i < SAL_N_ELEMENTS(checks2); ++i)
+ {
+ pDoc->GetValue(1, i+2, 0, result);
+ bool bGood = result == checks2[i];
+ if (!bGood)
+ {
+ cerr << "row " << (i+2+1) << ": expected=" << checks2[i] << " actual=" << result << endl;
CPPUNIT_ASSERT_MESSAGE("Unexpected result for N", false);
}
}