diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-05-24 13:28:03 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-05-24 13:52:10 +0000 |
| commit | 0d116ad98d7c25df4ad63839bcf2fd7f152956df (patch) | |
| tree | 1c937a7314ac76ecd1a8fe0fb2432e23f2ef1687 | |
| parent | b33fb0a8a09c2c383b5ed7915da52742cd457fec (diff) | |
Resolves: tdf#99733 don't crash on moving range of cells
Change-Id: Ib9afc8ef292e517954b24321100862f5235290e5
Reviewed-on: https://gerrit.libreoffice.org/25405
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sc/source/core/data/bcaslot.cxx | 9 | ||||
| -rw-r--r-- | sc/source/core/inc/bcaslot.hxx | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 0e64aa50cd02..8d5e1bb24623 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -506,7 +506,11 @@ void ScBroadcastAreaSlot::EraseArea( ScBroadcastAreas::iterator& rIter ) ScBroadcastArea* pArea = (*rIter).mpArea; aBroadcastAreaTbl.erase( rIter); if (!pArea->DecRef()) + { + if (pBASM->IsInBulkBroadcast()) + pBASM->RemoveBulkGroupArea(pArea); delete pArea; + } } } @@ -1158,6 +1162,11 @@ size_t ScBroadcastAreaSlotMachine::RemoveBulkArea( const ScBroadcastArea* pArea return aBulkBroadcastAreas.erase( pArea ); } +void ScBroadcastAreaSlotMachine::RemoveBulkGroupArea( ScBroadcastArea* pArea ) +{ + m_BulkGroupAreas.erase(pArea); +} + void ScBroadcastAreaSlotMachine::PushAreaToBeErased( ScBroadcastAreaSlot* pSlot, ScBroadcastAreas::iterator& rIter ) { diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index ab5b93cebc6f..a7d020b3ff3c 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -322,6 +322,7 @@ public: bool InsertBulkArea( const ScBroadcastArea* p ); void InsertBulkGroupArea( ScBroadcastArea* pArea, const ScRange& rRange ); + void RemoveBulkGroupArea( ScBroadcastArea* pArea ); void BulkBroadcastGroupAreas(); /// @return: how many removed |