diff options
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 8c4dd5cc6bda..9f64ea04796e 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 |