Kaydet (Commit) 3efcfc63 authored tarafından Eike Rathke's avatar Eike Rathke

Revert "Resolves: tdf#100637 narrow down the JumpMatrix path finish condition"

This reverts commit e54cd3fb.

It breaks other nested array IF expressions.
üst eb798883
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment