diff options
| -rw-r--r-- | sc/source/core/inc/interpre.hxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr6.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr7.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index ae62eae0dc2d..e7aec8766811 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -1024,13 +1024,13 @@ inline bool ScInterpreter::IsInArrayContext() const inline void ScInterpreter::MatrixJumpConditionToMatrix() { - if (bMatrixFormula || pCur->IsInForceArray()) + if (IsInArrayContext()) ConvertMatrixJumpConditionToMatrix(); } inline bool ScInterpreter::MatrixParameterConversion() { - if ( (bMatrixFormula || pCur->IsInForceArray() || ScParameterClassification::HasForceArray( pCur->GetOpCode())) && + if ( (IsInArrayContext() || ScParameterClassification::HasForceArray( pCur->GetOpCode())) && !pJumpMatrix && sp > 0 ) return ConvertMatrixParameters(); return false; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index fe02c2fe765d..4b51b676cc4f 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -1495,7 +1495,7 @@ bool ScInterpreter::ConvertMatrixParameters() // has ForceArray or ReferenceOrForceArray // parameter *somewhere else*) pick a normal // position dependent implicit intersection later. - (eType != formula::ParamClass::Value || bMatrixFormula || pCur->IsInForceArray())) + (eType != formula::ParamClass::Value || IsInArrayContext())) { SCCOL nCol1, nCol2; SCROW nRow1, nRow2; diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index b8ffd45e57db..f1eb0713fc2a 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -464,7 +464,7 @@ void IterateMatrix( size_t ScInterpreter::GetRefListArrayMaxSize( short nParamCount ) { size_t nSize = 0; - if (bMatrixFormula || pCur->IsInForceArray()) + if (IsInArrayContext()) { for (short i=1; i <= nParamCount; ++i) { diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index e2dd62717fb9..22c8cb33b3e9 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -47,7 +47,7 @@ void ScInterpreter::ScFilterXML() // In array/matrix context node elements' results are to be // subsequently stored. Check this before obtaining any argument from // the stack so the stack type can be used. - if (pJumpMatrix || bMatrixFormula || pCur->IsInForceArray()) + if (pJumpMatrix || IsInArrayContext()) { if (pJumpMatrix) { |