diff options
| author | Eike Rathke <erack@redhat.com> | 2015-02-06 23:32:54 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-02-06 23:41:16 +0100 |
| commit | e32eff2bb4c12fdc33e476b9f12bb4bb71d22ebc (patch) | |
| tree | be75d3561ece7ff672bb2252f794b021bf71d494 | |
| parent | 78f6e6f7cc9a30138330ee1b4041480b6f2bbb25 (diff) | |
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
| -rw-r--r-- | sc/source/core/tool/formularesult.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx index cf790c8b176a..61b56f5385cd 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(), |