sc/source/core/tool/formularesult.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cd1f5a81b7602040a7c88b30fd8dbde844fa2f71
Author: Eike Rathke <er...@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/14355
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/core/tool/formularesult.cxx
b/sc/source/core/tool/formularesult.cxx
index 658eb97..d50006b 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<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(),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
