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

Simplify a bit iterator + remove double check

Browse source 
Change-Id: I4a12bacc1a3774741cf4bf3eb6770e16d0cecc6e
Reviewed-on: https://gerrit.libreoffice.org/5639
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>
This commit is contained in:
Julien Nabet 2013-08-27 07:25:33 +02:00 committed by Thorsten Behrens
parent 5e9137c963
commit 8763c77c39
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
toolkit/source/controls/tree/treedatamodel.cxx
View file

@ -436,23 +436,16 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( sal_Int32 nChildIndex ) throw
{
::osl::Guard< ::osl::Mutex > aGuard( maMutex );
if( (nChildIndex < 0) || (nChildIndex >= (sal_Int32)maChildren.size()) )
throw IndexOutOfBoundsException();
MutableTreeNodeRef xImpl;
if( (nChildIndex >= 0) && (nChildIndex < (sal_Int32)maChildren.size()) )
{
TreeNodeVector::iterator aIter( maChildren.begin() );
while( nChildIndex-- && (aIter != maChildren.end()) )
++aIter;
TreeNodeVector::iterator aIter( maChildren.begin() );
std::advance(aIter, nChildIndex);
if( aIter != maChildren.end() )
{
xImpl = (*aIter);
maChildren.erase( aIter );
}
}
if( !xImpl.is() )
throw IndexOutOfBoundsException();
xImpl = (*aIter);
maChildren.erase( aIter );
xImpl->setParent(0);
xImpl->mbIsInserted = false;