Kaydet (Commit) 7a182026 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

don't use delete with remove_if, related fdo#54498

Change-Id: I508ceb8dfe13fbfe54b4262d26bd215462c90c40
üst e6bca122
......@@ -705,9 +705,16 @@ void ScRangeList::DeleteArea( SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2 )
{
ScRange aRange( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
iterator itrDel = std::remove_if(maRanges.begin(), maRanges.end(), FindRangeIn<ScRange>(aRange));
for_each(itrDel, maRanges.end(), ScDeleteObjectByPtr<ScRange>());
maRanges.erase(itrDel, maRanges.end());
for(size_t i = 0; i < maRanges.size();)
{
if(FindRangeIn(aRange)(maRanges[i]))
{
ScRange* pRange = Remove(i);
delete pRange;
}
else
++i;
}
std::vector<ScRange> aNewRanges;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment