From 5e6a0eed2743b99dbbe133168204fdb184608476 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 23 Jul 2015 22:21:49 +0200
Subject: svx: replace boost::ptr_vector with std::vector<std::unique_ptr>

Change-Id: I512ed27ef812498e021e320259b1e0862969a10e
---
 include/svx/PaletteManager.hxx         |  8 +++++---
 svx/source/tbxctrls/PaletteManager.cxx | 20 +++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index 7af989c1d862..7ad0cdb8ee86 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -23,7 +23,6 @@
 #include <svx/Palette.hxx>
 #include <rtl/ustring.hxx>
 #include <svx/tbxcolorupdate.hxx>
-#include <deque>
 
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
@@ -33,7 +32,9 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 
-#include <boost/ptr_container/ptr_vector.hpp>
+#include <deque>
+#include <vector>
+#include <memory>
 
 class PaletteManager
 {
@@ -47,7 +48,8 @@ class PaletteManager
 
     Color                   mLastColor;
     std::deque<Color>       maRecentColors;
-    boost::ptr_vector<Palette> maPalettes;
+    std::vector<std::unique_ptr<Palette>> m_Palettes;
+
 public:
     PaletteManager();
     ~PaletteManager();
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index 3334afc3e6bc..658348fcf3eb 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -39,7 +39,7 @@ PaletteManager::PaletteManager() :
     mLastColor(COL_AUTO)
 {
     LoadPalettes();
-    mnNumOfPalettes += maPalettes.size();
+    mnNumOfPalettes += m_Palettes.size();
 }
 
 PaletteManager::~PaletteManager()
@@ -48,7 +48,7 @@ PaletteManager::~PaletteManager()
 
 void PaletteManager::LoadPalettes()
 {
-    maPalettes.clear();
+    m_Palettes.clear();
     OUString aPalPaths = SvtPathOptions().GetPalettePath();
 
     std::stack<OUString> aDirs;
@@ -82,16 +82,16 @@ void PaletteManager::LoadPalettes()
                     OUString aFName = aFileStat.getFileName();
                     if (aNames.find(aFName) == aNames.end())
                     {
-                        Palette* pPalette = 0;
+                        std::unique_ptr<Palette> pPalette;
                         if( aFName.endsWithIgnoreAsciiCase(".gpl") )
-                            pPalette = new PaletteGPL( aFileStat.getFileURL(), aFName );
+                            pPalette.reset(new PaletteGPL(aFileStat.getFileURL(), aFName));
                         else if( aFName.endsWithIgnoreAsciiCase(".soc") )
-                            pPalette = new PaletteSOC( aFileStat.getFileURL(), aFName );
+                            pPalette.reset(new PaletteSOC(aFileStat.getFileURL(), aFName));
                         else if ( aFName.endsWithIgnoreAsciiCase(".ase") )
-                            pPalette = new PaletteASE( aFileStat.getFileURL(), aFName );
+                            pPalette.reset(new PaletteASE(aFileStat.getFileURL(), aFName));
 
                         if( pPalette && pPalette->IsValid() )
-                            maPalettes.push_back( pPalette );
+                            m_Palettes.push_back( std::move(pPalette) );
                         aNames.insert(aFName);
                     }
                 }
@@ -136,7 +136,7 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet &rColorSet)
     }
     else
     {
-        maPalettes[mnCurrentPalette-1].LoadColorSet( rColorSet );
+        m_Palettes[mnCurrentPalette-1]->LoadColorSet( rColorSet );
         mnColorCount = rColorSet.GetItemCount();
     }
 }
@@ -159,9 +159,7 @@ std::vector<OUString> PaletteManager::GetPaletteList()
 
     aPaletteNames.push_back( SVX_RESSTR( RID_SVXSTR_DEFAULT_PAL ) );
 
-    for( boost::ptr_vector<Palette>::iterator it = maPalettes.begin();
-         it != maPalettes.end();
-         ++it)
+    for (auto const& it : m_Palettes)
     {
         aPaletteNames.push_back( (*it).GetName() );
     }
-- 
cgit