summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorRafael Dominguez <venccsralph@gmail.com>2011-06-12 18:37:27 -0430
committerJoseph Powers <jpowers27@cox.net>2011-06-18 06:30:57 -0700
commit008179de694e8e2f5fe95bbddf6ba5673dc67fcc (patch)
treeea95dae5ccd12b475d45714bfd7ad1b3ab355fca /sd
parentbe10718636f1ab9f7102baea84893aaec9b93469 (diff)
Replace List with std::vector<SfxStyleSheetBase*>.
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/stlpool.cxx24
1 files changed, 5 insertions, 19 deletions
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index c5f36fe94791..826e340e7331 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -870,7 +870,7 @@ void SdStyleSheetPool::UpdateStdNames()
{
String aHelpFile;
sal_uInt32 nCount = aStyles.size();
- List* pEraseList = NULL;
+ std::vector<SfxStyleSheetBase*> aEraseList;
for( sal_uInt32 n=0; n < nCount; n++ )
{
@@ -953,30 +953,16 @@ void SdStyleSheetPool::UpdateStdNames()
else
{
// Sheet existiert schon: Altes Sheet muss entfernt werden
- if( !pEraseList )
- {
- pEraseList = new List();
- }
-
- pEraseList->Insert( pStyle );
+ aEraseList.push_back( pStyle );
}
}
}
}
}
- if ( pEraseList )
- {
- // Styles, welche nicht umbenannt werden konnten, muessen entfernt werden
- for ( sal_uLong i = 0; i < pEraseList->Count(); i++ )
- {
- SfxStyleSheetBase* pEraseSheet = ( SfxStyleSheetBase* ) pEraseList->GetObject( i );
- Remove( pEraseSheet );
- }
-
- delete pEraseList;
- pEraseList = NULL;
- }
+ // Styles, welche nicht umbenannt werden konnten, muessen entfernt werden
+ for ( size_t i = 0, n = aEraseList.size(); i < n; ++i )
+ Remove( aEraseList[ i ] );
}
// --------------------------------------------------------------------
// Neues SvxNumBulletItem fuer das jeweilige StyleSheet setzen