Convert SV_DECL_PTRARR_DEL(ImageItemListDescriptor) to boost::ptr_vector

Change-Id: Ic3b06e179d182d68288c7c6832149309160cd637

7 files changed, 20 insertions, 26 deletions

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index acb134732ebe..7f5aed991d30 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1479,11 +1479,11 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl
 {
     SvtFileDialogFilter_Impl* pFoundFilter = NULL;
     SvtFileDialogFilterList_Impl* pList = _pImp->_pFilter;
-    sal_uInt16 nFilter = pList->Count();
+    sal_uInt16 nFilter = pList->size();
 
     while ( nFilter-- )
     {
-        SvtFileDialogFilter_Impl* pFilter = pList->GetObject( nFilter );
+        SvtFileDialogFilter_Impl* pFilter = &(*pList)[ nFilter ];
         const String& rType = pFilter->GetType();
         String aSingleType = rType;
 
@@ -2191,7 +2191,7 @@ short SvtFileDialog::PrepareExecute()
                         break;
                 }
             }
-            SvtFileDialogFilter_Impl* pNewCurFilter = _pImp->_pFilter->GetObject( nPos );
+            SvtFileDialogFilter_Impl* pNewCurFilter = &(*_pImp->_pFilter)[ nPos ];
             DBG_ASSERT( pNewCurFilter, "SvtFileDialog::Execute: invalid filter pos!" );
             _pImp->SetCurFilter( pNewCurFilter, pNewCurFilter->GetName() );
         }
@@ -2366,7 +2366,7 @@ void SvtFileDialog::OpenURL_Impl( const String& _rURL )
 SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const String& _rFilter, const String& _rType )
 {
     SvtFileDialogFilter_Impl* pNewFilter = new SvtFileDialogFilter_Impl( _rFilter, _rType );
-    _pImp->_pFilter->C40_INSERT( SvtFileDialogFilter_Impl, pNewFilter, (sal_uInt16)0 );
+    _pImp->_pFilter->push_front( pNewFilter );
 
     if ( !_pImp->GetCurFilter() )
         _pImp->SetCurFilter( pNewFilter, _rFilter );
@@ -2400,11 +2400,11 @@ void SvtFileDialog::SetCurFilter( const String& rFilter )
     DBG_ASSERT( !IsInExecute(), "SvtFileDialog::SetCurFilter: currently executing!" );
 
     // look for corresponding filter
-    sal_uInt16 nPos = _pImp->_pFilter->Count();
+    sal_uInt16 nPos = _pImp->_pFilter->size();
 
     while ( nPos-- )
     {
-        SvtFileDialogFilter_Impl* pFilter = _pImp->_pFilter->GetObject( nPos );
+        SvtFileDialogFilter_Impl* pFilter = &(*_pImp->_pFilter)[ nPos ];
         if ( pFilter->GetName() == rFilter )
         {
             _pImp->SetCurFilter( pFilter, rFilter );
@@ -2435,7 +2435,7 @@ String SvtFileDialog::getCurFilter( ) const
 
 sal_uInt16 SvtFileDialog::GetFilterCount() const
 {
-    return _pImp->_pFilter->Count();
+    return _pImp->_pFilter->size();
 }
 
 //*****************************************************************************
@@ -2443,7 +2443,7 @@ sal_uInt16 SvtFileDialog::GetFilterCount() const
 const String& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const
 {
     DBG_ASSERT( nPos < GetFilterCount(), "invalid index" );
-    return _pImp->_pFilter->GetObject( nPos )->GetName();
+    return (*_pImp->_pFilter)[ nPos ].GetName();
 }
 
 //*****************************************************************************
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 84a714894afa..01b3a9436347 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -122,8 +122,6 @@ SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl()
 // SvtFileDialogFilterList_Impl
 //*****************************************************************************
 
-SV_IMPL_PTRARR( SvtFileDialogFilterList_Impl, SvtFileDialogFilter_Impl* );
-
 //=============================================================================
 //= SvtFileDialogURLSelector
 //=============================================================================
@@ -375,15 +373,15 @@ void SvtExpFileDlg_Impl::InitFilterList( )
     ClearFilterList( );
 
     // reinit it
-    sal_uInt16 nPos = _pFilter->Count();
+    sal_uInt16 nPos = _pFilter->size();
 
     // search for the first entry which is no group separator
-    while ( nPos-- && _pFilter->GetObject( nPos ) && _pFilter->GetObject( nPos )->isGroupSeparator() )
+    while ( nPos-- && (*_pFilter)[ nPos ].isGroupSeparator() )
         ;
 
     // add all following entries
     while ( (sal_Int16)nPos >= 0 )
-        InsertFilterListEntry( _pFilter->GetObject( nPos-- ) );
+        InsertFilterListEntry( &(*_pFilter)[ nPos-- ] );
 }
 
 //-----------------------------------------------------------------------------
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 7a30e9392758..12bfc0a0a59e 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -37,9 +37,8 @@
 #include <vcl/timer.hxx>
 #include <vcl/group.hxx>
 
-#include "svl/svarray.hxx"
-
 #include <vector>
+#include <boost/ptr_container/ptr_deque.hpp>
 
 class Accelerator;
 class CheckBox;
@@ -76,7 +75,7 @@ public:
     sal_Bool            isGroupSeparator() const    { return 0 == m_aType.Len(); }
 };
 
-SV_DECL_PTRARR_DEL( SvtFileDialogFilterList_Impl, SvtFileDialogFilter_Impl*, 3 )
+typedef boost::ptr_deque<SvtFileDialogFilter_Impl> SvtFileDialogFilterList_Impl;
 
 enum SvtFileDlgMode
 {
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index fcf8b3f68fb5..8ea756e58d12 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -65,8 +65,7 @@ struct ExternalImageItemDescriptor
     String  aURL;                       // a URL to an external bitmap
 };
 
-typedef ImageItemDescriptor* ImageItemDescriptorPtr;
-SV_DECL_PTRARR_DEL( ImageItemListDescriptor, ImageItemDescriptorPtr, 10 )
+typedef boost::ptr_vector<ImageItemDescriptor> ImageItemListDescriptor;
 
 typedef boost::ptr_vector<ExternalImageItemDescriptor> ExternalImageItemListDescriptor;
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 52e498e30aed..9d105ca85ee2 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -507,12 +507,12 @@ sal_Bool ImageManagerImpl::implts_loadUserImages(
                 ( !aUserImageListInfo.pImageList->empty() ))
             {
                 ImageListItemDescriptor* pList = &aUserImageListInfo.pImageList->front();
-                sal_Int32 nCount = pList->pImageItemList->Count();
+                sal_Int32 nCount = pList->pImageItemList->size();
                 std::vector< OUString > aUserImagesVector;
                 aUserImagesVector.reserve(nCount);
                 for ( sal_uInt16 i=0; i < nCount; i++ )
                 {
-                    const ImageItemDescriptor* pItem = pList->pImageItemList->GetObject(i);
+                    const ImageItemDescriptor* pItem = &(*pList->pImageItemList)[i];
                     aUserImagesVector.push_back( pItem->aCommandURL );
                 }
 
@@ -589,7 +589,7 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
 
                 pItem->nIndex = i;
                 pItem->aCommandURL = pImageList->GetImageName( i );
-                pList->pImageItemList->Insert( pItem, pList->pImageItemList->Count() );
+                pList->pImageItemList->push_back( pItem );
             }
 
             pList->aURL = String::CreateFromAscii("Bitmaps/");
diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx
index d6e934d97a34..1823283bff2b 100644
--- a/framework/source/xml/imagesconfiguration.cxx
+++ b/framework/source/xml/imagesconfiguration.cxx
@@ -61,8 +61,6 @@ using namespace ::com::sun::star::io;
 namespace framework
 {
 
-SV_IMPL_PTRARR( ImageItemListDescriptor, ImageItemDescriptorPtr );
-
 static Reference< XParser > GetSaxParser(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory
     )
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index ce7cec331579..f613e17d4b19 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -393,7 +393,7 @@ throw(  SAXException, RuntimeException )
                 }
 
                 if ( m_pImages )
-                    m_pImages->pImageItemList->Insert( pItem, m_pImages->pImageItemList->Count() );
+                    m_pImages->pImageItemList->push_back( pItem );
             }
             break;
 
@@ -765,8 +765,8 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor*
     ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList;
     if ( pImageItemList )
     {
-        for ( sal_uInt16 i = 0; i < pImageItemList->Count(); i++ )
-            WriteImage( (*pImageItemList)[i] );
+        for ( sal_uInt16 i = 0; i < pImageItemList->size(); i++ )
+            WriteImage( &(*pImageItemList)[i] );
     }
 
     m_xWriteDocumentHandler->endElement( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_IMAGES )) );