summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-01-27 15:14:39 +0200
committerTor Lillqvist <tml@collabora.com>2016-01-27 21:13:58 +0000
commit32333afd215ffcdc320845937dd524a08fe4f9b0 (patch)
tree586695a7bcd740b95e11032a3b395acd64063bed
parent5f6df9fd46e28ba579bac90e7f5431b95f0a490f (diff)
tdf#96222: Don't attempt to handle matrix formulas as formula groups
(Also known as array formulas.) (cherry picked from commit aee3355a8a7a6b7749f2eddd74e9389fe5782186) (cherry picked from commit 4d43f0c018c1f0fb12f55ebb16c074fb60a8aa73) Change-Id: Ief61c75efb05ea7c880d05e118d9fe10177774db Reviewed-on: https://gerrit.libreoffice.org/21839 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/core/data/formulacell.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index e574af78c742..8b4a72716e3e 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3947,6 +3947,12 @@ bool ScFormulaCell::InterpretFormulaGroup()
return false;
}
+ if (cMatrixFlag != MM_NONE)
+ {
+ mxGroup->meCalcState = sc::GroupCalcDisabled;
+ return false;
+ }
+
switch (pCode->GetVectorState())
{
case FormulaVectorEnabled: