diff options
| author | Eike Rathke <erack@redhat.com> | 2016-08-04 18:57:46 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-08-04 18:58:34 +0200 |
| commit | e85bb29a029300bbed18ca0c25bdc9a31773e9cc (patch) | |
| tree | 67e3f1fa59f600dc00f32be39d814e60419d520c | |
| parent | e5632d9b2f194a89ec4e60cd99fc050691b14a1e (diff) | |
re-enable unit test for tdf#100637 nested array IF with scalar
Change-Id: If2b6d5d8dcbad1472d12753083ba431b59713a7f
| -rw-r--r-- | sc/qa/unit/ucalc_formula.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index f5f65bf3d97d..d3c158fd6687 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -3926,17 +3926,13 @@ void Test::testFuncIF() m_pDoc->SetValue(ScAddress(1,0,0), 3.0); CPPUNIT_ASSERT_EQUAL(OUString("not two"), m_pDoc->GetString(ScAddress(0,0,0))); -/* FIXME: temporarily disabled because e54cd3fbf40300416ef337981bd356b88ad44a41 - * reverted; reactivate when fixed again. */ -#if 0 - // Test nested IF in array/matrix. + // Test nested IF in array/matrix if the nested IF is not already a matrix. ScMarkData aMark; aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0,2, 1,2, aMark, "=IF({1;0};IF(1;23);42)"); // Results must be 23 and 42. CPPUNIT_ASSERT_EQUAL(23.0, m_pDoc->GetValue(ScAddress(0,2,0))); CPPUNIT_ASSERT_EQUAL(42.0, m_pDoc->GetValue(ScAddress(1,2,0))); -#endif m_pDoc->DeleteTab(0); } |