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:21:34 +0200 |
| commit | c9d037e5e8e5850e9c69372580e7a506b573fc2a (patch) | |
| tree | cf780f6dfdcf4111547e485cf1596f6dfe1ebe90 /sc | |
| parent | e2ae9f3e8cb625cd8a1f6c93b665a06672038fb6 (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
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/inc/interpre.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 37d7f6053c02..4708e0488496 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -888,7 +888,7 @@ public: inline void ScInterpreter::MatrixDoubleRefToMatrix() { - if ( bMatrixFormula && GetStackType() == formula::svDoubleRef ) + if ( (bMatrixFormula || pCur->HasForceArray()) && GetStackType() == formula::svDoubleRef ) { GetTokenMatrixMap(); // make sure it exists, create if not. PopDoubleRefPushMatrix(); |