Remove DECLARE_LIST( SvXMLAutoStylePoolCache_Impl, OUStringPtr )

1 files changed, 9 insertions, 8 deletions

diff --git a/xmloff/source/style/impastp1.cxx b/xmloff/source/style/impastp1.cxx
index 688313bf7197..20e246433f6e 100644
--- a/xmloff/source/style/impastp1.cxx
+++ b/xmloff/source/style/impastp1.cxx
@@ -61,12 +61,13 @@ XMLFamilyData_Impl::~XMLFamilyData_Impl()
 {
     if( mpParentList ) delete mpParentList;
     if( mpNameList ) delete mpNameList;
-    DBG_ASSERT( !pCache || !pCache->Count(),
-                "auto style pool cache is not empty!" );
+    DBG_ASSERT( !pCache || !pCache->size(), "auto style pool cache is not empty!" );
     if( pCache )
     {
-        while( pCache->Count() )
-            delete pCache->Remove( 0UL );
+        for ( size_t i = 0, n = pCache->size(); i < n; ++i )
+            delete (*pCache)[ i ];
+        pCache->clear();
+        delete pCache;
     }
 }
 
@@ -75,12 +76,12 @@ void XMLFamilyData_Impl::ClearEntries()
     if( mpParentList )
         delete mpParentList;
     mpParentList = new SvXMLAutoStylePoolParentsP_Impl( 5, 5 );
-    DBG_ASSERT( !pCache || !pCache->Count(),
-                "auto style pool cache is not empty!" );
+    DBG_ASSERT( !pCache || !pCache->size(), "auto style pool cache is not empty!" );
     if( pCache )
     {
-        while( pCache->Count() )
-            delete pCache->Remove( 0UL );
+        for ( size_t i = 0, n = pCache->size(); i < n; ++i )
+            delete (*pCache)[ i ];
+        pCache->clear();
     }
 }