sc/inc/documentimport.hxx | 2 ++
sc/source/core/data/documentimport.cxx | 14 ++++++++++++++
sc/source/filter/oox/sheetdatabuffer.cxx | 16 ++++++++++++++--
3 files changed, 30 insertions(+), 2 deletions(-)
New commits:
commit 4384444051ba2a59002e500f2ef209279bb9cae0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Feb 16 11:14:48 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Feb 18 14:43:32 2022 +0100
clear ScDocumentImport position cache if iterators are invalid
SheetDataBuffer::finalizeArrayFormula calls
ScCellRangeObj::setArrayTokens
ScDocFunc::EnterMatrix
ScDocument::InsertMatrixFormula
and InsertMatrixFormula calls the variant of ScColumn::SetFormulaCell
which doesn't take a sc::ColumnBlockPosition& param when SetFormulaCell
adds a cell to the column so any iterators belonging to ScDocumentImport
are invalid.
Change-Id: Ic2814ecbeafdeb99632d2a255ed6c1dedf7376b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129991
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index cefe2949dcc7..0e49e073fd62 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -125,6 +125,8 @@ public:
void setMergedCells(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
+ void invalidateBlockPositionSet(SCTAB nTab);
+
void finalize();
/** Broadcast all formula cells that are marked with
diff --git a/sc/source/core/data/documentimport.cxx
b/sc/source/core/data/documentimport.cxx
index ab4cb64fdcb2..d47d50a4cb35 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -99,6 +99,15 @@ struct ScDocumentImportImpl
return rTab.getBlockPosition(nCol);
}
+ void invalidateBlockPositionSet(SCTAB nTab)
+ {
+ if (o3tl::make_unsigned(nTab) >= maBlockPosSet.size())
+ return;
+
+ sc::TableColumnBlockPositionSet& rTab = maBlockPosSet[nTab];
+ rTab.invalidate();
+ }
+
void initForSheets()
{
size_t n = mrDoc.GetTableCount();
@@ -186,6 +195,11 @@ void ScDocumentImport::setOriginDate(sal_uInt16 nYear,
sal_uInt16 nMonth, sal_uI
mpImpl->mrDoc.pDocOptions->SetDate(nDay, nMonth, nYear);
}
+void ScDocumentImport::invalidateBlockPositionSet(SCTAB nTab)
+{
+ mpImpl->invalidateBlockPositionSet(nTab);
+}
+
void ScDocumentImport::setAutoInput(const ScAddress& rPos, const OUString&
rStr, const ScSetStringParam* pStringParam)
{
ScTable* pTab = mpImpl->mrDoc.FetchTable(rPos.Tab());
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 4421c3222a17..d4d0ad87affd 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -442,9 +442,22 @@ void SheetDataBuffer::addColXfStyleProcessRowRanges()
void SheetDataBuffer::finalizeImport()
{
+ ScDocumentImport& rDocImport = getDocImport();
+
+ SCTAB nStartTabInvalidatedIters(SCTAB_MAX);
+ SCTAB nEndTabInvalidatedIters(0);
+
// create all array formulas
for( const auto& [rRange, rTokens] : maArrayFormulas )
- finalizeArrayFormula( rRange, rTokens );
+ {
+ finalizeArrayFormula(rRange, rTokens);
+
+ nStartTabInvalidatedIters = std::min(rRange.aStart.Tab(),
nStartTabInvalidatedIters);
+ nEndTabInvalidatedIters = std::max(rRange.aEnd.Tab(),
nEndTabInvalidatedIters);
+ }
+
+ for (SCTAB nTab = nStartTabInvalidatedIters; nTab <=
nEndTabInvalidatedIters; ++nTab)
+ rDocImport.invalidateBlockPositionSet(nTab);
// create all table operations
for( const auto& [rRange, rModel] : maTableOperations )
@@ -457,7 +470,6 @@ void SheetDataBuffer::finalizeImport()
addColXfStyleProcessRowRanges();
- ScDocumentImport& rDocImport = getDocImport();
ScDocument& rDoc = rDocImport.getDoc();
StylesBuffer& rStyles = getStyles();
for ( const auto& [rCol, rRowStyles] : maStylesPerColumn )
