sc: boost::ptr_vector->std::vector

Change-Id: Ic4af0579f31c2076fcbc4ac76266e0ae49cb2be8

sc/inc/userlist.hxx

@@ -22,7 +22,6 @@
 
 #include "scdllapi.h"
 
-#include <boost/ptr_container/ptr_vector.hpp>
 #include <vector>
 
 /**
@@ -47,7 +46,6 @@ private:
 public:
     ScUserListData(const OUString& rStr);
     ScUserListData(const ScUserListData& rData);
-    ~ScUserListData();
 
     const OUString& GetString() const { return aStr; }
     void SetString(const OUString& rStr);
@@ -63,7 +61,7 @@ public:
  */
 class SC_DLLPUBLIC ScUserList
 {
-    typedef ::boost::ptr_vector<ScUserListData> DataType;
+    typedef std::vector<ScUserListData> DataType;
     DataType maData;
 public:
     typedef DataType::iterator iterator;
@@ -85,8 +83,9 @@ public:
     iterator begin();
     const_iterator begin() const;
     void clear();
+    void reserve(size_t size) { maData.reserve(size); }
     size_t size() const;
-    void push_back(ScUserListData* p);
+    void push_back(const ScUserListData& r) { maData.push_back(r); }
     void erase(iterator itr);
 };
 

sc/source/core/tool/appoptio.cxx

@@ -180,11 +180,11 @@ static void lcl_SetSortList( const Any& rValue )
         if (!bDefault)
         {
             aList.clear();
+            aList.reserve(nCount);
 
             for (long i=0; i<nCount; i++)
             {
-                ScUserListData* pNew = new ScUserListData( pArray[i] );
-                aList.push_back(pNew);
+                aList.push_back( ScUserListData( pArray[i] ) );
             }
         }
 

sc/source/core/tool/userlist.cxx

@@ -96,10 +96,6 @@ ScUserListData::ScUserListData(const ScUserListData& rData) :
     InitTokens();
 }
 
-ScUserListData::~ScUserListData()
-{
-}
-
 void ScUserListData::SetString( const OUString& rStr )
 {
     aStr = rStr;
@@ -237,9 +233,9 @@ ScUserList::ScUserList()
             OUString aDayLong = aDayLongBuf.makeStringAndClear();
 
             if ( !HasEntry( aDayShort ) )
-                maData.push_back( new ScUserListData( aDayShort ));
+                maData.push_back( ScUserListData( aDayShort ));
             if ( !HasEntry( aDayLong ) )
-                maData.push_back( new ScUserListData( aDayLong ));
+                maData.push_back( ScUserListData( aDayLong ));
         }
 
         xCal = xCalendars[j].Months;
@@ -262,9 +258,9 @@ ScUserList::ScUserList()
             OUString aMonthLong = aMonthLongBuf.makeStringAndClear();
 
             if ( !HasEntry( aMonthShort ) )
-                maData.push_back( new ScUserListData( aMonthShort ));
+                maData.push_back( ScUserListData( aMonthShort ));
             if ( !HasEntry( aMonthLong ) )
-                maData.push_back( new ScUserListData( aMonthLong ));
+                maData.push_back( ScUserListData( aMonthLong ));
         }
     }
 }
@@ -350,11 +346,6 @@ size_t ScUserList::size() const
     return maData.size();
 }
 
-void ScUserList::push_back(ScUserListData* p)
-{
-    maData.push_back(p);
-}
-
 void ScUserList::erase(iterator itr)
 {
     maData.erase(itr);

sc/source/ui/optdlg/tpusrlst.cxx

@@ -344,7 +344,7 @@ void ScTpUserLists::AddNewList( const OUString& rEntriesStr )
 
     MakeListStr( theEntriesStr );
 
-    pUserLists->push_back(new ScUserListData(theEntriesStr));
+    pUserLists->push_back(ScUserListData(rEntriesStr));
 }
 
 void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,

sc/source/ui/unoobj/appluno.cxx

@@ -358,12 +358,12 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue(
 
             pUserList->clear();                 // alle Eintraege raus
             sal_uInt16 nCount = (sal_uInt16)aSeq.getLength();
+            pUserList->reserve(nCount);
             const OUString* pAry = aSeq.getConstArray();
             for (sal_uInt16 i=0; i<nCount; i++)
             {
                 OUString aEntry = pAry[i];
-                ScUserListData* pData = new ScUserListData(aEntry);
-                pUserList->push_back(pData);
+                pUserList->push_back( ScUserListData(aEntry) );
             }
             bSaveApp = true;    // Liste wird mit den App-Optionen gespeichert
         }