From cd1f5a81b7602040a7c88b30fd8dbde844fa2f71 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Fri, 6 Feb 2015 23:32:54 +0100 Subject: Resolves: tdf#83461 do not override MatColsRows if already set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/14355 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sc/source/core/tool/formularesult.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx index 658eb97821e5..d50006b27ade 100644 --- a/sc/source/core/tool/formularesult.cxx +++ b/sc/source/core/tool/formularesult.cxx @@ -168,7 +168,7 @@ void ScFormulaResult::SetToken( const formula::FormulaToken* p ) { const ScMatrixFormulaCellToken* pNewMatFormula = dynamic_cast(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(), -- cgit v1.2.3