Kaydet (Commit) 49d1ab03 authored tarafından Julien Nabet's avatar Julien Nabet

Use return iterator from erase in swnewtable (sw)

Change-Id: I748ebeeef41a102feb63c304d4fae64775a3c8e2
Reviewed-on: https://gerrit.libreoffice.org/45998Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 1d8cb97f
......@@ -1269,9 +1269,7 @@ static void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr,
if( pCurr->first == aLnOfs.first )
{ // These boxes can be removed because the last insertion
// of rows will expand their row span above the needed value
std::list< SwLineOffset >::iterator pDel = pCurr;
++pCurr;
aBoxes.erase( pDel );
pCurr = aBoxes.erase(pCurr);
}
else
{
......@@ -1286,9 +1284,7 @@ static void lcl_SophisticatedFillLineIndices( SwLineOffsetArray &rArr,
if( pCurr->second >= nCnt )
{ // if the row span is bigger than the split factor
// this box is done
std::list< SwLineOffset >::iterator pDel = pCurr;
++pCurr;
aBoxes.erase( pDel );
pCurr = aBoxes.erase(pCurr);
}
else
++pCurr;
......@@ -2146,9 +2142,7 @@ void SwTable::CheckConsistency() const
"Wrong row span value" );
if( nRowSp == -1 )
{
std::list< RowSpanCheck >::iterator aEraseIter = aIter;
++aIter;
aRowSpanCells.erase( aEraseIter );
aIter = aRowSpanCells.erase(aIter);
}
else
++aIter;
......
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