diff options
| -rw-r--r-- | sc/source/core/data/documen7.cxx | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index 6429fa53267c..ea06c2a0faae 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -410,6 +410,7 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet CalcAll(); else { + ::std::vector<ScFormulaCell*> vAlwaysDirty; ScFormulaCell* pCell = pFormulaTree; while ( pCell ) { @@ -419,12 +420,11 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet { if ( pCell->GetCode()->IsRecalcModeAlways() ) { - // pCell wird im SetDirty neu angehaengt! - ScFormulaCell* pNext = pCell->GetNext(); - pCell->SetDirty(); - // falls pNext==0 und neue abhaengige hinten angehaengt - // wurden, so macht das nichts, da die alle bDirty sind - pCell = pNext; + // pCell and dependents are to be set dirty again, collect + // them first and broadcast afterwards to not break the + // FormulaTree chain here. + vAlwaysDirty.push_back( pCell); + pCell = pCell->GetNext(); } else { // andere simpel berechnen @@ -434,6 +434,14 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet } } } + for (::std::vector<ScFormulaCell*>::iterator it( vAlwaysDirty.begin()), itEnd( vAlwaysDirty.end()); + it != itEnd; ++it) + { + pCell = *it; + if (!pCell->GetDirty()) + pCell->SetDirty(); + } + bool bProgress = !bOnlyForced && nFormulaCodeInTree && bProgressBar; if ( bProgress ) ScProgress::CreateInterpretProgress( this, true ); |