diff options
Diffstat (limited to 'sc/source/core/tool/sharedformula.cxx')
| -rw-r--r-- | sc/source/core/tool/sharedformula.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sc/source/core/tool/sharedformula.cxx b/sc/source/core/tool/sharedformula.cxx index 84025b91fc04..5f3c399e9e90 100644 --- a/sc/source/core/tool/sharedformula.cxx +++ b/sc/source/core/tool/sharedformula.cxx @@ -18,7 +18,7 @@ namespace sc { -void SharedFormulaUtil::splitFormulaCellGroup(const CellStoreType::position_type& aPos) +void SharedFormulaUtil::splitFormulaCellGroup(const CellStoreType::position_type& aPos, sc::EndListeningContext* pCxt) { SCROW nRow = aPos.first->position + aPos.second; @@ -63,7 +63,14 @@ void SharedFormulaUtil::splitFormulaCellGroup(const CellStoreType::position_type // other listeners, all listeners of this group's top cell are to be reset. if (nLength2) { - rPrevTop.EndListeningTo( rPrevTop.GetDocument(), NULL, ScAddress( ScAddress::UNINITIALIZED)); + // If a context exists it has to be used to not interfere with + // ScColumn::maBroadcasters iterators, which the EndListeningTo() + // without context would do when removing a broadcaster that had its + // last listener removed. + if (pCxt) + rPrevTop.EndListeningTo(*pCxt); + else + rPrevTop.EndListeningTo( rPrevTop.GetDocument(), NULL, ScAddress( ScAddress::UNINITIALIZED)); rPrevTop.SetNeedsListening(true); } #endif @@ -109,7 +116,7 @@ void SharedFormulaUtil::splitFormulaCellGroups(CellStoreType& rCells, std::vecto if (aPos.first == rCells.end()) return; - splitFormulaCellGroup(aPos); + splitFormulaCellGroup(aPos, nullptr); std::vector<SCROW>::iterator itEnd = rBounds.end(); for (++it; it != itEnd; ++it) { @@ -118,7 +125,7 @@ void SharedFormulaUtil::splitFormulaCellGroups(CellStoreType& rCells, std::vecto if (aPos.first == rCells.end()) return; - splitFormulaCellGroup(aPos); + splitFormulaCellGroup(aPos, nullptr); } } |