diff options
| author | Eike Rathke <erack@redhat.com> | 2015-11-16 13:38:54 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-11-16 13:46:39 +0100 |
| commit | b31b17e52b2b2b94999d68c4b2ed5c74ee7eed0a (patch) | |
| tree | 1f3af9d956d7b6ff03311874aff7feab5b465e30 | |
| parent | 01fc64876398fc391ded6ae14300c598518b2d2a (diff) | |
prevent ForceArray propagation on the same token, tdf#95670 follow-up
This may happen if the last RPN token is put and the function has a
ForceArray parameter but now again would be wrong if not all parameters
are ForceArray.
Change-Id: I890fb6b5b88337033cfcf2e8189371ee39461205
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 00988f6509f5..421e829e7e14 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -2256,7 +2256,7 @@ bool FormulaCompiler::IsForceArrayParameter( const FormulaToken* /*pToken*/, sal void FormulaCompiler::ForceArrayOperator( FormulaTokenRef& rCurr ) { - if (!pCurrentFactorToken) + if (!pCurrentFactorToken || (pCurrentFactorToken.get() == rCurr.get())) return; if (!(rCurr->GetOpCode() != ocPush && (rCurr->GetType() == svByte || rCurr->GetType() == svJump))) |