[Libreoffice-commits] core.git: sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jul 27 08:50:19 UTC 2018
sc/source/core/inc/interpre.hxx | 4 ++--
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/core/tool/interpr6.cxx | 2 +-
sc/source/core/tool/interpr7.cxx | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit a0a8c958e358d93bb84e26e307d95df05be7f31a
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Thu Jul 26 16:03:44 2018 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Fri Jul 27 10:49:47 2018 +0200
Use IsInArrayContext() instead of (bMatrixFormula || pCur->IsInForceArray())
Change-Id: I50debd5be2e0d4db0b5c57676d03ec33a2c38737
Reviewed-on: https://gerrit.libreoffice.org/58128
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
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)
{
More information about the Libreoffice-commits
mailing list