diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-10 13:22:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-10 15:30:02 +0200 |
| commit | 5ec7d783ed8a9506389005d4a63da507abdb68dd (patch) | |
| tree | d8286ef034bc52f7c3380ceac8354d9e3e70a792 /cui | |
| parent | 13815efe3d92226155531e523cbd0cf1faaa8d54 (diff) | |
cui: convert boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I96a1090ea8617644748afdea2786949fb0506b72
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/selector.cxx | 10 | ||||
| -rw-r--r-- | cui/source/inc/selector.hxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index a713d0d1f15a..7f4c65e1221e 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -378,7 +378,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode SvxGroupInfo_Impl* pInfo = new SvxGroupInfo_Impl( SVX_CFGGROUP_SCRIPTCONTAINER, 0, theChild ); pNewEntry->SetUserData( pInfo ); - aArr.push_back( pInfo ); + aArr.push_back( std::unique_ptr<SvxGroupInfo_Impl>(pInfo) ); if ( _bCheapChildrenOnDemand ) { @@ -500,7 +500,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame SvxGroupInfo_Impl *pInfo = new SvxGroupInfo_Impl( SVX_CFGGROUP_FUNCTION, gids[i] ); - aArr.push_back( pInfo ); + aArr.push_back( std::unique_ptr<SvxGroupInfo_Impl>(pInfo) ); pEntry->SetUserData( pInfo ); } @@ -532,7 +532,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame SvTreeListEntry *pNewEntry = InsertEntry( aTitle ); pNewEntry->SetUserData( pInfo ); pNewEntry->EnableChildrenOnDemand(); - aArr.push_back( pInfo ); + aArr.push_back( std::unique_ptr<SvxGroupInfo_Impl>(pInfo) ); } else { @@ -726,7 +726,7 @@ void SvxConfigGroupListBox::GroupSelected() SvxGroupInfo_Impl *_pGroupInfo = new SvxGroupInfo_Impl( SVX_CFGFUNCTION_SLOT, 123, aCmdURL, OUString() ); - pFunctionListBox->aArr.push_back( _pGroupInfo ); + pFunctionListBox->aArr.push_back( std::unique_ptr<SvxGroupInfo_Impl>(_pGroupInfo) ); pFuncEntry->SetUserData( _pGroupInfo ); } @@ -783,7 +783,7 @@ void SvxConfigGroupListBox::GroupSelected() pNewEntry->SetUserData( _pGroupInfo ); - pFunctionListBox->aArr.push_back( _pGroupInfo ); + pFunctionListBox->aArr.push_back( std::unique_ptr<SvxGroupInfo_Impl>(_pGroupInfo) ); } } diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 4d65c0484190..2f6b194873af 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/script/browse/XBrowseNode.hpp> -#include <boost/ptr_container/ptr_vector.hpp> +#include <memory> class SaveInData; @@ -80,7 +80,7 @@ struct SvxGroupInfo_Impl } }; -typedef boost::ptr_vector<SvxGroupInfo_Impl> SvxGroupInfoArr_Impl; +typedef std::vector<std::unique_ptr<SvxGroupInfo_Impl> > SvxGroupInfoArr_Impl; class SvxConfigFunctionListBox : public SvTreeListBox { |