strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix previous STL conversion commit:

Browse source 
Check that iterators are not end() before incrementing.

Change-Id: I9c29c707f165306261523e320099dfa6f0527f30
This commit is contained in:
Michael Stahl 2012-07-17 15:20:52 +02:00
parent 66c7b8fe56
commit 39ea1402d8
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sw/source/core/doc/docfld.cxx
View file

@ -1107,8 +1107,10 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
if( !pUpdtFlds->GetSortLst()->empty() )
{
_SetGetExpFlds::const_iterator itLast = pUpdtFlds->GetSortLst()->lower_bound( (_SetGetExpFld*)&rToThisFld );
if( **itLast == rToThisFld )
if (pUpdtFlds->GetSortLst()->end() != itLast && **itLast == rToThisFld)
{
++itLast;
}
for( _SetGetExpFlds::const_iterator it = pUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
lcl_CalcFld( *this, rCalc, **it, pMgr );
@ -1132,7 +1134,9 @@ void SwDoc::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
( (*it)->GetNode() == nLastNd && (*it)->GetCntnt() <= nLastCnt )
);
++it )
{
lcl_CalcFld( *this, rCalc, **it, pMgr );
}
pMgr->CloseAll(sal_False);
}
@ -1153,8 +1157,10 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblSize,
_SetGetExpFlds::const_iterator itLast;
{
itLast = pUpdtFlds->GetSortLst()->lower_bound( (_SetGetExpFld*)&rToThisFld );
if( **itLast == rToThisFld )
if (pUpdtFlds->GetSortLst()->end() != itLast && **itLast == rToThisFld)
{
++itLast;
}
}
for( _SetGetExpFlds::const_iterator it = pUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )