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

[Eike Rathke]

 sc/source/ui/unoobj/funcuno.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit df5b20f737d4f56f86a6d19f509e13294c313d89
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Jun 15 13:05:16 2017 +0200

    Resolves: tdf#104989 a matrix/array formula cell needs to have dimensions
    
    Most spreadsheet functions don't need it, but some may.
    
    Change-Id: I954acaa0a64c4dac8d15acd5b3f404019a7e0bce
    (cherry picked from commit 033d018a3a1d345d61f3c4dc4da693cdd4004dea)
    Reviewed-on: https://gerrit.libreoffice.org/38830
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 81e13bde7bd8..c3b66b9d447f 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -592,6 +592,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName,
             pDoc, aFormulaPos, aTokenArr, formula::FormulaGrammar::GRAM_API,
             mbArray ? ScMatrixMode::Formula : ScMatrixMode::NONE );
         pFormula = pDoc->SetFormulaCell(aFormulaPos, pFormula);
+        if (mbArray && pFormula)
+            pFormula->SetMatColsRows(1,1);  // the cell dimensions (only one cell)
 
         //  call GetMatrix before GetErrCode because GetMatrix always recalculates
         //  if there is no matrix result