From 5bd709c6ab5c8e8ca6aee75af2b14b0b30281286 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Thu, 10 Feb 2011 21:48:39 -0800 Subject: Remove DECLARE_LIST( ComponentEntryList, ComponentEntry* ) --- toolkit/source/controls/stdtabcontroller.cxx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'toolkit/source/controls') diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx index 47cb26e89453..40d0eb25836a 100644 --- a/toolkit/source/controls/stdtabcontroller.cxx +++ b/toolkit/source/controls/stdtabcontroller.cxx @@ -263,7 +263,7 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException) Reference< XWindow > * pComponents = aCompSeq.getArray(); ComponentEntryList aCtrls; - sal_uInt32 n; + size_t n; for ( n = 0; n < nCtrls; n++ ) { XWindow* pC = (XWindow*)pComponents[n].get(); @@ -274,31 +274,37 @@ void StdTabController::autoTabOrder( ) throw(RuntimeException) pE->aPos.Y() = aPosSize.Y; sal_uInt16 nPos; - for ( nPos = 0; nPos < aCtrls.Count(); nPos++ ) + for ( nPos = 0; nPos < aCtrls.size(); nPos++ ) { - ComponentEntry* pEntry = aCtrls.GetObject( nPos ); + ComponentEntry* pEntry = aCtrls[ nPos ]; if ( pEntry->aPos.Y() >= pE->aPos.Y() ) { while ( pEntry && ( pEntry->aPos.Y() == pE->aPos.Y() ) && ( pEntry->aPos.X() < pE->aPos.X() ) ) { - pEntry = aCtrls.GetObject( ++nPos ); + pEntry = aCtrls[ ++nPos ]; } break; } } - aCtrls.Insert( pE, nPos ); + if ( nPos < aCtrls.size() ) { + ComponentEntryList::iterator it = aCtrls.begin(); + ::std::advance( it, nPos ); + aCtrls.insert( it, pE ); + } else { + aCtrls.push_back( pE ); + } } Sequence< Reference< XControlModel > > aNewSeq( nCtrls ); for ( n = 0; n < nCtrls; n++ ) { - ComponentEntry* pE = aCtrls.GetObject( n ); + ComponentEntry* pE = aCtrls[ n ]; Reference< XControl > xUC( pE->pComponent, UNO_QUERY ); aNewSeq.getArray()[n] = xUC->getModel(); delete pE; } - aCtrls.Clear(); + aCtrls.clear(); mxModel->setControlModels( aNewSeq ); } -- cgit