framework: boost::ptr_vector->std::vector<std::unique_ptr>

Change-Id: I10801343e65646b92eb0a6256cd7bfbf5c84c854

3 files changed, 5 insertions, 6 deletions

diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 0931e822d7a3..61778f081687 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -30,7 +30,6 @@
 
 #include <vector>
 #include <memory>
-#include <boost/ptr_container/ptr_vector.hpp>
 
 namespace framework
 {
@@ -75,7 +74,7 @@ struct ImageListItemDescriptor
     OUString                    aHighContrastMaskURL;   // an URL to an optional high contrast bitmap as a mask
 };
 
-typedef boost::ptr_vector<ImageListItemDescriptor> ImageListDescriptor;
+typedef std::vector<std::unique_ptr<ImageListItemDescriptor> > ImageListDescriptor;
 
 struct ImageListsDescriptor
 {
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 973819430d71..b7f271a6d5f4 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -440,7 +440,7 @@ bool ImageManagerImpl::implts_loadUserImages(
             if (( aUserImageListInfo.pImageList != nullptr ) &&
                 ( !aUserImageListInfo.pImageList->empty() ))
             {
-                ImageListItemDescriptor* pList = &aUserImageListInfo.pImageList->front();
+                ImageListItemDescriptor* pList = aUserImageListInfo.pImageList->front().get();
                 sal_Int32 nCount = pList->pImageItemList->size();
                 std::vector< OUString > aUserImagesVector;
                 aUserImagesVector.reserve(nCount);
@@ -512,7 +512,7 @@ bool ImageManagerImpl::implts_storeUserImages(
             aUserImageListInfo.pImageList = new ImageListDescriptor;
 
             ImageListItemDescriptor* pList = new ImageListItemDescriptor;
-            aUserImageListInfo.pImageList->push_back( pList );
+            aUserImageListInfo.pImageList->push_back( std::unique_ptr<ImageListItemDescriptor>(pList) );
 
             pList->pImageItemList = new ImageItemListDescriptor;
             for ( sal_uInt16 i=0; i < pImageList->GetImageCount(); i++ )
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index 89c3513c9fb2..0ba98b3d353d 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -510,7 +510,7 @@ void SAL_CALL OReadImagesDocumentHandler::endElement(const OUString& aName)
                 if ( m_pImages )
                 {
                     if ( m_aImageList.pImageList )
-                        m_aImageList.pImageList->push_back( m_pImages );
+                        m_aImageList.pImageList->push_back( std::unique_ptr<ImageListItemDescriptor>(m_pImages) );
                     m_pImages = nullptr;
                 }
                 m_bImagesStartFound = false;
@@ -642,7 +642,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw
 
         for ( size_t i = 0; i < m_aImageListsItems.pImageList->size(); i++ )
         {
-            const ImageListItemDescriptor* pImageItems = &(*pImageList)[i];
+            const ImageListItemDescriptor* pImageItems = (*pImageList)[i].get();
             WriteImageList( pImageItems );
         }
     }