sc/source/core/data/bcaslot.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 849d879ac1805198b4714c1c5b2a75780ab86479
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Oct 7 21:38:38 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Oct 8 21:34:18 2021 +0200
Clean up a bit iterator management in sc/bcaslot
Change-Id: I2bced8cb78ccecf85798f3468aab87681d520180
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123235
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 9a9940445b7a..65dbb97a9450 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -85,7 +85,7 @@ ScBroadcastAreaSlot::~ScBroadcastAreaSlot()
ScBroadcastArea* pArea = (*aIter).mpArea;
// Erase all so no hash will be accessed upon destruction of the
// unordered_map.
- aBroadcastAreaTbl.erase( aIter++);
+ aIter = aBroadcastAreaTbl.erase(aIter);
if (!pArea->DecRef())
delete pArea;
}
@@ -348,7 +348,7 @@ void ScBroadcastAreaSlot::DelBroadcastAreasInRange( const
ScRange& rRange )
if (rRange.In( rAreaRange))
{
ScBroadcastArea* pArea = (*aIter).mpArea;
- aBroadcastAreaTbl.erase( aIter++); // erase before modifying
+ aIter = aBroadcastAreaTbl.erase(aIter); // erase before modifying
if (!pArea->DecRef())
{
if (pBASM->IsInBulkBroadcast())
@@ -377,7 +377,7 @@ void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode
eUpdateRefMode,
ScBroadcastArea* pArea = (*aIter).mpArea;
if ( pArea->IsInUpdateChain() )
{
- aBroadcastAreaTbl.erase( aIter++);
+ aIter = aBroadcastAreaTbl.erase(aIter);
pArea->DecRef();
}
else
@@ -387,7 +387,7 @@ void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode
eUpdateRefMode,
nCol1,nRow1,nTab1, nCol2,nRow2,nTab2, nDx,nDy,nDz,
theCol1,theRow1,theTab1, theCol2,theRow2,theTab2 ))
{
- aBroadcastAreaTbl.erase( aIter++);
+ aIter = aBroadcastAreaTbl.erase(aIter);
pArea->DecRef();
if (pBASM->IsInBulkBroadcast())
pBASM->RemoveBulkArea( pArea);
@@ -951,14 +951,14 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas(
// Remove sheets, if any, iDel or/and iTab may as well point to
end().
while (iDel != iTab)
{
- aTableSlotsMap.erase( iDel++);
+ iDel = aTableSlotsMap.erase(iDel);
}
// shift remaining down
while (iTab != aTableSlotsMap.end())
{
SCTAB nTab = (*iTab).first + nDz;
aTableSlotsMap[nTab] = std::move((*iTab).second);
- aTableSlotsMap.erase( iTab++);
+ iTab = aTableSlotsMap.erase(iTab);
}
}
else
