[Libreoffice-commits] core.git: formula/source

[Eike Rathke]

 formula/source/core/api/FormulaCompiler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b31b17e52b2b2b94999d68c4b2ed5c74ee7eed0a
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Nov 16 13:38:54 2015 +0100

    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

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 00988f65..421e829 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)))