xmloff: replace boost::ptr_vector with std::vector<std::unique_ptr>

Change-Id: Icb51f02ca761d683d926135fcaedc1164cd1ae8d

xmloff/source/style/impastpl.cxx

@@ -282,9 +282,9 @@ bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vector<
     XMLAutoStylePoolProperties *pProperties = 0;
     sal_Int32 nProperties = rProperties.size();
     size_t i = 0;
-    for (size_t n = maPropertiesList.size(); i < n; ++i)
+    for (size_t n = m_PropertiesList.size(); i < n; ++i)
     {
-        XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
+        XMLAutoStylePoolProperties *const pIS = m_PropertiesList[i].get();
         if( nProperties > (sal_Int32)pIS->GetProperties().size() )
         {
             continue;
@@ -303,9 +303,9 @@ bool XMLAutoStylePoolParent::Add( XMLAutoStyleFamily& rFamilyData, const vector<
     if( !pProperties )
     {
         pProperties = new XMLAutoStylePoolProperties( rFamilyData, rProperties, msParent );
-        PropertiesListType::iterator it = maPropertiesList.begin();
+        PropertiesListType::iterator it = m_PropertiesList.begin();
         ::std::advance( it, i );
-        maPropertiesList.insert( it, pProperties );
+        m_PropertiesList.insert(it, std::unique_ptr<XMLAutoStylePoolProperties>(pProperties));
         bAdded = true;
     }
 
@@ -325,9 +325,9 @@ bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData, const ve
     bool bAdded = false;
     sal_Int32 nProperties = rProperties.size();
     size_t i = 0;
-    for (size_t n = maPropertiesList.size(); i < n; ++i)
+    for (size_t n = m_PropertiesList.size(); i < n; ++i)
     {
-        XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
+        XMLAutoStylePoolProperties *const pIS = m_PropertiesList[i].get();
         if( nProperties > (sal_Int32)pIS->GetProperties().size() )
         {
             continue;
@@ -340,13 +340,13 @@ bool XMLAutoStylePoolParent::AddNamed( XMLAutoStyleFamily& rFamilyData, const ve
 
     if (rFamilyData.maNameSet.find(rName) == rFamilyData.maNameSet.end())
     {
-        XMLAutoStylePoolProperties* pProperties =
-                new XMLAutoStylePoolProperties( rFamilyData, rProperties, msParent );
+        std::unique_ptr<XMLAutoStylePoolProperties> pProperties(
+            new XMLAutoStylePoolProperties(rFamilyData, rProperties, msParent));
         // ignore the generated name
         pProperties->SetName( rName );
-        PropertiesListType::iterator it = maPropertiesList.begin();
+        PropertiesListType::iterator it = m_PropertiesList.begin();
         ::std::advance( it, i );
-        maPropertiesList.insert( it, pProperties );
+        m_PropertiesList.insert(it, std::move(pProperties));
         bAdded = true;
     }
 
@@ -361,9 +361,9 @@ OUString XMLAutoStylePoolParent::Find( const XMLAutoStyleFamily& rFamilyData, co
 {
     OUString sName;
     vector< XMLPropertyState>::size_type nItems = rProperties.size();
-    for (size_t i = 0, n = maPropertiesList.size(); i < n; ++i)
+    for (size_t i = 0, n = m_PropertiesList.size(); i < n; ++i)
     {
-        const XMLAutoStylePoolProperties* pIS = &maPropertiesList[i];
+        const XMLAutoStylePoolProperties *const pIS = m_PropertiesList[i].get();
         if( nItems > pIS->GetProperties().size() )
         {
             continue;
@@ -636,8 +636,8 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
         size_t nProperties = rParent.GetPropertiesList().size();
         for( size_t j = 0; j < nProperties; j++ )
         {
-            XMLAutoStylePoolProperties* pProperties =
-                &rParent.GetPropertiesList()[j];
+            XMLAutoStylePoolProperties *const pProperties =
+                rParent.GetPropertiesList()[j].get();
             sal_uLong nPos = pProperties->GetPos();
             assert(nPos < nCount);
             assert(!aExpStyles[nPos].mpProperties);

xmloff/source/style/impastpl.hxx

@@ -35,7 +35,6 @@
 #include <xmloff/xmlexppr.hxx>
 
 #include <boost/noncopyable.hpp>
-#include <boost/ptr_container/ptr_vector.hpp>
 
 class SvXMLAutoStylePoolP;
 class XMLAutoStylePoolParent;
@@ -70,11 +69,11 @@ public:
 class XMLAutoStylePoolParent
 {
 public:
-    typedef boost::ptr_vector<XMLAutoStylePoolProperties> PropertiesListType;
+    typedef std::vector<std::unique_ptr<XMLAutoStylePoolProperties>> PropertiesListType;
 
 private:
     OUString msParent;
-    PropertiesListType maPropertiesList;
+    PropertiesListType m_PropertiesList;
 
 public:
 
@@ -95,7 +94,7 @@ public:
 
     PropertiesListType& GetPropertiesList()
     {
-        return maPropertiesList;
+        return m_PropertiesList;
     }
 
     bool operator< (const XMLAutoStylePoolParent& rOther) const;