sc/source/core/data/dociter.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 1eb2d67ded3856134404928c32b0e0fb35076934 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Dec 14 16:46:55 2023 +0000 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Dec 19 12:51:53 2023 +0100 Related: cool#6893 ScFormulaGroupIterator::next creates columns that didn't exist before. Lots of time spent in ScColContainer::resize on getting document statistics. ScColContainer: :resize ScTable: :CreateColumnIfNotExistsImpl ScTable: :FetchColumn ScFormulaGroupIterator: :next ScDocument: :GetFormulaGroupCount ScDocument: :GetDocStat Change-Id: I52d4ab052e21215eb650bdccf4abc056ee2dd405 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160784 Reviewed-by: Michael Meeks <[email protected]> Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit f3af1998741aeb7897aa5306ff16e7788bda2aa0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160800 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 35c0d2caa8fd..b1fca78c86be 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -803,7 +803,7 @@ sc::FormulaGroupEntry* ScFormulaGroupIterator::next() return nullptr; } ScTable *pTab = mrDoc.FetchTable(mnTab); - ScColumn *pCol = pTab ? pTab->FetchColumn(mnCol) : nullptr; + ScColumn *pCol = (pTab && pTab->IsColValid(mnCol)) ? pTab->FetchColumn(mnCol) : nullptr; if (pCol) { mbNullCol = false;
