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

[Eike Rathke]

 sc/qa/unit/ucalc_formula.cxx     |    4 ++++
 sc/source/core/tool/interpr4.cxx |   18 +++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 1b6caaeb7a323e91b6f6e2f3612a3bdc0a09fb45
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Aug 3 21:50:20 2016 +0200

    disable unit test for tdf#100637 until fixed again
    
    Change-Id: I5f5b442534585bdb69878d8790fb887dd65f0ccd

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index b2bfb37..f5f65bf 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -3926,6 +3926,9 @@ 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.
     ScMarkData aMark;
     aMark.SelectOneTable(0);
@@ -3933,6 +3936,7 @@ void Test::testFuncIF()
     // 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);
 }
commit 3efcfc63eec7a75545e4f01fd15448744ad651fa
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Aug 3 21:41:38 2016 +0200

    Revert "Resolves: tdf#100637 narrow down the JumpMatrix path finish condition"
    
    This reverts commit e54cd3fbf40300416ef337981bd356b88ad44a41.
    
    It breaks other nested array IF expressions.

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 8c4dd5c..9f64ea0 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4369,18 +4369,14 @@ StackVar ScInterpreter::Interpret()
             {
                 if (nLevel == 1)
                     aErrorFunctionStack.push( nErrorFunction);
-                // Restrict nLevel==1 to not prematurely discard a path result.
-                if (nLevel == 2 || (!aCode.HasStacked() || aCode.IsEndOfPath()))
+                bGotResult = JumpMatrix( nLevel );
+                if (aErrorFunctionStack.empty())
+                    assert(!"ScInterpreter::Interpret - aErrorFunctionStack empty in JumpMatrix context");
+                else
                 {
-                    bGotResult = JumpMatrix( nLevel );
-                    if (aErrorFunctionStack.empty())
-                        assert(!"ScInterpreter::Interpret - aErrorFunctionStack empty in JumpMatrix context");
-                    else
-                    {
-                        nErrorFunction = aErrorFunctionStack.top();
-                        if (bGotResult)
-                            aErrorFunctionStack.pop();
-                    }
+                    nErrorFunction = aErrorFunctionStack.top();
+                    if (bGotResult)
+                        aErrorFunctionStack.pop();
                 }
             }
             else