diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-07-01 11:24:08 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2020-07-10 17:13:02 +0200 |
| commit | 1a1b1504a5d5846049c7435e95ff5517f6b975de (patch) | |
| tree | 3e7bd37d791c029ba1674d1ead6dd58a891dfb80 | |
| parent | df6d4c50943a039acf75593a3e09376cef795d07 (diff) | |
don't add a cell to a non-existent column (tdf#104865)
This change also needs invalidating column position hints if
the columns get changed by the copying of the cells.
Change-Id: I4793e25f253c0197d88b313bc9336435cef649f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97603
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
(cherry picked from commit ee2d2184133b3bf47d38a03b14abab2caa15dad1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97673
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
(cherry picked from commit 8765592db900fae22ff2a0440fe94842dcbd805f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97684
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98506
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | sc/inc/mtvelements.hxx | 1 | ||||
| -rw-r--r-- | sc/source/core/data/mtvelements.cxx | 5 | ||||
| -rw-r--r-- | sc/source/core/data/table2.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/table3.cxx | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx index 0727bda0fa7f..7fa266ecf8f0 100644 --- a/sc/inc/mtvelements.hxx +++ b/sc/inc/mtvelements.hxx @@ -167,6 +167,7 @@ public: ~TableColumnBlockPositionSet(); ColumnBlockPosition* getBlockPosition( SCCOL nCol ); + void invalidate(); // discards cached positions }; ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator& itPos, size_t nOffset ); diff --git a/sc/source/core/data/mtvelements.cxx b/sc/source/core/data/mtvelements.cxx index 21eef33cad45..56c0fbab0d9a 100644 --- a/sc/source/core/data/mtvelements.cxx +++ b/sc/source/core/data/mtvelements.cxx @@ -150,6 +150,11 @@ ColumnBlockPosition* TableColumnBlockPositionSet::getBlockPosition( SCCOL nCol ) return &it->second; } +void TableColumnBlockPositionSet::invalidate() +{ + mpImpl->maColumns.clear(); +} + ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator& itPos, size_t nOffset ) { switch (itPos->type) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index d7c225ed2115..1b0cc1e4bfe1 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -3834,7 +3834,7 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n if (bThisTab) { - aCell.release(aCol[nDestX], nDestY); + aCell.release(CreateColumnIfNotExists(nDestX), nDestY); SetPattern( nDestX, nDestY, *GetPattern( nCol, nRow ) ); } else diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 41a130d65f6c..1ee6456d84a6 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -3131,6 +3131,8 @@ SCSIZE ScTable::Query(const ScQueryParam& rParamOrg, bool bKeepSub) if (bResult) { CopyData( aParam.nCol1,j, aParam.nCol2,j, aParam.nDestCol,nOutRow,aParam.nDestTab ); + if( nTab == aParam.nDestTab ) // copy to self, changes may invalidate caching position hints + blockPos.invalidate(); ++nOutRow; } } |