From 3453879aac287670db6f700ab98b2519912e9355 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 13 Jun 2014 10:50:27 +0200 Subject: resolved fdo#79957 propagate ForceArray through jump tokens ForceArray parameters weren't propagated and enforced to array arguments on svJump tokens (FormulaJumpToken), namely IF, CHOOSE, IFERROR and IFNA. Change-Id: Icf9074f11b826655a52858d778d9a0122d207aa4 (cherry picked from commit c9d037e5e8e5850e9c69372580e7a506b573fc2a) --- formula/source/core/api/token.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'formula/source') diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 8da6dcebb255..0dd8d5c4d628 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -287,11 +287,16 @@ bool FormulaFAPToken::operator==( const FormulaToken& r ) const { return FormulaByteToken::operator==( r ) && pOrigToken == r.GetFAPOrigToken(); } + + short* FormulaJumpToken::GetJump() const { return pJump; } +bool FormulaJumpToken::HasForceArray() const { return bHasForceArray; } +void FormulaJumpToken::SetForceArray( bool b ) { bHasForceArray = b; } bool FormulaJumpToken::operator==( const FormulaToken& r ) const { return FormulaToken::operator==( r ) && pJump[0] == r.GetJump()[0] && - memcmp( pJump+1, r.GetJump()+1, pJump[0] * sizeof(short) ) == 0; + memcmp( pJump+1, r.GetJump()+1, pJump[0] * sizeof(short) ) == 0 && + bHasForceArray == r.HasForceArray(); } FormulaJumpToken::~FormulaJumpToken() { -- cgit