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

remove problem inserted by a DECLARE_LIST removal

Browse source 
the DECLARE_LIST container decremented the internal index pointin to the current element when REMOVE was called, when we now iterate over the new container and remove an element we must do this ourself
This commit is contained in:
Markus Mohrhard 2011-05-25 01:21:30 +02:00 committed by Kohei Yoshida
parent bded50069f
commit a015d23d8f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sc/source/core/tool/rangelst.cxx
View file

@ -315,6 +315,7 @@ void ScRangeList::Join( const ScRange& r, bool bIsInList )
if ( bIsInList )
{ // innerhalb der Liste Range loeschen
Remove(nOldPos);
i--;
delete pOver;
pOver = NULL;
if ( nOldPos )
@ -804,7 +805,7 @@ void ScRangePairList::Join( const ScRangePair& r, bool bIsInList )
}
bool bJoinedInput = false;
for ( size_t i = 0, nPairs = maPairs.size(); i < nPairs && pOver; ++i )
for ( size_t i = 0; i < maPairs.size() && pOver; ++i )
{
ScRangePair* p = maPairs[ i ];
if ( p == pOver )
@ -878,6 +879,7 @@ void ScRangePairList::Join( const ScRangePair& r, bool bIsInList )
if ( bIsInList )
{ // innerhalb der Liste RangePair loeschen
Remove( nOldPos );
i--;
delete pOver;
pOver = NULL;
if ( nOldPos )