diff options
| author | Eike Rathke <erack@redhat.com> | 2014-06-13 10:50:27 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-06-13 14:43:12 +0200 |
| commit | 3453879aac287670db6f700ab98b2519912e9355 (patch) | |
| tree | 63a0034e7efa81e41e820ec7b3b17fd0f7ff346d /include | |
| parent | 7c084ae9787451445b23df6dd92978616eaca8f7 (diff) | |
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)
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/FormulaCompiler.hxx | 6 | ||||
| -rw-r--r-- | include/formula/token.hxx | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 81277c9ee4bb..a4fd1af678c2 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -356,9 +356,9 @@ private: static inline void ForceArrayOperator( FormulaTokenRef& rCurr, const FormulaTokenRef& rPrev ) { - if ( rPrev && rPrev->HasForceArray() && - rCurr->GetType() == svByte && rCurr->GetOpCode() != ocPush - && !rCurr->HasForceArray() ) + if ( rPrev && rPrev->HasForceArray() && rCurr->GetOpCode() != ocPush && + (rCurr->GetType() == svByte || rCurr->GetType() == svJump) && + !rCurr->HasForceArray() ) rCurr->SetForceArray( true); } diff --git a/include/formula/token.hxx b/include/formula/token.hxx index d1654cce5f12..2efba0db00d7 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -352,15 +352,18 @@ class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken { private: short* pJump; + bool bHasForceArray; public: FormulaJumpToken( OpCode e, short* p ) : - FormulaToken( formula::svJump , e) + FormulaToken( formula::svJump , e), + bHasForceArray( false) { pJump = new short[ p[0] + 1 ]; memcpy( pJump, p, (p[0] + 1) * sizeof(short) ); } FormulaJumpToken( const FormulaJumpToken& r ) : - FormulaToken( r ) + FormulaToken( r ), + bHasForceArray( r.bHasForceArray) { pJump = new short[ r.pJump[0] + 1 ]; memcpy( pJump, r.pJump, (r.pJump[0] + 1) * sizeof(short) ); @@ -369,6 +372,8 @@ public: virtual short* GetJump() const SAL_OVERRIDE; virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaJumpToken(*this); } + virtual bool HasForceArray() const SAL_OVERRIDE; + virtual void SetForceArray( bool b ) SAL_OVERRIDE; }; |