diff options
author | Eike Rathke <erack@redhat.com> | 2016-08-23 00:28:33 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-08-24 23:31:35 +0000 |
commit | 00c587abdf6c6a9e6c50f8f8cf51ba2cc47a74f9 (patch) | |
tree | ec0974cc0511a87205cda49143a477beb08a2b42 /sc/source/ui/docshell/externalrefmgr.cxx | |
parent | a5dfea5a55cce6db0ca002f56e57a6f522a717eb (diff) |
Resolves: tdf#101137 handle empty elements in matrix concatenation
Change-Id: I2de90e1cdfc4f215f6d7c644e0ab74372a4c2639
(cherry picked from commit 31d39c24e1ff2d3602e0212eeeecd8de88da6d38)
Reviewed-on: https://gerrit.libreoffice.org/28336
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'sc/source/ui/docshell/externalrefmgr.cxx')
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index f703b6798ee1..4ac4112032ef 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -865,9 +865,13 @@ void ScExternalRefCache::setCellRangeData(sal_uInt16 nFileId, const ScRange& rRa { pTabData->setCell(col + nCol1, row + nRow1, new formula::FormulaStringToken(val), 0, false); }; + ScFullMatrix::EmptyOpFunction aEmptyFunc = [=](size_t /*row*/, size_t /*col*/) -> void + { + // Nothing. Empty cell. + }; pMat->ExecuteOperation(std::pair<size_t, size_t>(0, 0), std::pair<size_t, size_t>(nRow2-nRow1, nCol2-nCol1), - aDoubleFunc, aBoolFunc, aStringFunc); + aDoubleFunc, aBoolFunc, aStringFunc, aEmptyFunc); // Mark the whole range 'cached'. pTabData->setCachedCellRange(nCol1, nRow1, nCol2, nRow2); } |