[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source

[Tor Lillqvist]

 sc/source/core/data/formulacell.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 32333afd215ffcdc320845937dd524a08fe4f9b0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 27 15:14:39 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index e574af7..8b4a727 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: