diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-23 22:21:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-24 10:58:54 +0200 |
| commit | 5e6a0eed2743b99dbbe133168204fdb184608476 (patch) | |
| tree | 361256fef4d27ccf4811be8074d4a908b1683624 /svx/source/tbxctrls/PaletteManager.cxx | |
| parent | 2f467535231af44af5ee857e2444a87779e82b2c (diff) | |
svx: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I512ed27ef812498e021e320259b1e0862969a10e
Diffstat (limited to 'svx/source/tbxctrls/PaletteManager.cxx')
| -rw-r--r-- | svx/source/tbxctrls/PaletteManager.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
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() ); } |