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

[Eike Rathke]

 sc/source/core/tool/formularesult.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5236e24afddeba986802dea10f988f0559365ff8
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Feb 6 23:32:54 2015 +0100

    Resolves: tdf#83461 do not override MatColsRows if already set
    
    ScMatrixFormulaCellToken::SetMatColsRows() via
    ScFormulaCell::SetMatColsRows() is used during document import and
    preselected cell area input of an array formula. Do not override
    existing values with subsequent result matrix dimensions.
    
    Change-Id: I9e844b5064ea276f3cbcb680eb1127c344328e00
    (cherry picked from commit e32eff2bb4c12fdc33e476b9f12bb4bb71d22ebc)
    Reviewed-on: https://gerrit.libreoffice.org/14354
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx
index cf790c8..61b56f5 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -167,7 +167,7 @@ void ScFormulaResult::SetToken( const formula::FormulaToken* p )
         {
             const ScMatrixFormulaCellToken* pNewMatFormula =
                 dynamic_cast<const ScMatrixFormulaCellToken*>(pMatResult);
-            if (pNewMatFormula)
+            if (pNewMatFormula && (pMatFormula->GetMatCols() <= 0 || pMatFormula->GetMatRows() <= 0))
             {
                 SAL_WARN( "sc", "ScFormulaResult::SetToken: pNewMatFormula and pMatFormula, overriding matrix formula dimension; intended?");
                 pMatFormula->SetMatColsRows( pNewMatFormula->GetMatCols(),