diff options
author | Noel Grandin <noel@peralex.com> | 2012-06-28 11:02:42 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-07-04 23:23:22 +0200 |
commit | ebde6c7e3e816980dfe32086783a165f3d0019b1 (patch) | |
tree | 03d4bf793e73cef523937021d593d3d460436da2 /svtools/source/contnr | |
parent | a87c24fcfe1d8842d892185d6f9f2e07c52c3804 (diff) |
Convert aItems field of SvLBoxEntry class from SvPtrarr to std::vector
Change-Id: I96d676ded52ebdf0f68b051b06cecf717d56e813
Diffstat (limited to 'svtools/source/contnr')
-rw-r--r-- | svtools/source/contnr/svlbox.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index 617428d60937..d0d30adbdc41 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -408,21 +408,21 @@ SvLBoxEntry::~SvLBoxEntry() void SvLBoxEntry::DeleteItems_Impl() { DBG_CHKTHIS(SvLBoxEntry,0); - sal_uInt16 nCount = aItems.Count(); + sal_uInt16 nCount = aItems.size(); while( nCount ) { nCount--; - SvLBoxItem* pItem = (SvLBoxItem*)aItems.GetObject( nCount ); + SvLBoxItem* pItem = aItems[ nCount ]; delete pItem; } - aItems.Remove(0, aItems.Count() ); + aItems.clear(); } void SvLBoxEntry::AddItem( SvLBoxItem* pItem ) { DBG_CHKTHIS(SvLBoxEntry,0); - aItems.Insert( pItem, aItems.Count() ); + aItems.push_back( pItem ); } void SvLBoxEntry::Clone( SvListEntry* pSource ) @@ -461,15 +461,14 @@ void SvLBoxEntry::ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos ) SvLBoxItem* pOld = GetItem( nPos ); if ( pOld ) { - aItems.Remove( nPos ); - aItems.Insert( pNewItem, nPos ); + aItems[ nPos ] = pNewItem; delete pOld; } } SvLBoxItem* SvLBoxEntry::GetFirstItem( sal_uInt16 nId ) { - sal_uInt16 nCount = aItems.Count(); + sal_uInt16 nCount = aItems.size(); sal_uInt16 nCur = 0; SvLBoxItem* pItem; while( nCur < nCount ) |