diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-11 14:08:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 08:01:35 +0200 |
| commit | c8b2f752ceefaf128579524eb2bd62bc6c79f0ba (patch) | |
| tree | bed36baf17db6ceb37864c560c75721a853d5c6a /sfx2 | |
| parent | 10629489d39044c79967c0e7a38e1fdd5025f069 (diff) | |
sfx2: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I6a0b9d539489b7774c3437871f31fd28e737c901
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/pch/precompiled_sfx.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/inc/virtmenu.hxx | 5 | ||||
| -rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 30f8c8db141f..8c5132aca1bd 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -44,7 +44,6 @@ #include <boost/noncopyable.hpp> #include <boost/optional.hpp> #include <boost/ptr_container/ptr_map.hpp> -#include <boost/ptr_container/ptr_vector.hpp> #include <memory> #include <boost/tuple/tuple.hpp> #include <cassert> diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index f353169ab0d7..bf892ee01edc 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -19,14 +19,15 @@ #ifndef INCLUDED_SFX2_SOURCE_INC_VIRTMENU_HXX #define INCLUDED_SFX2_SOURCE_INC_VIRTMENU_HXX -#include <boost/ptr_container/ptr_vector.hpp> +#include <vector> +#include <memory> #include <sfx2/mnuitem.hxx> class SfxBindings; class SfxMenuImageControl_Impl; -typedef ::boost::ptr_vector<SfxMenuControl> SfxMenuCtrlArr_Impl; +typedef std::vector<std::unique_ptr<SfxMenuControl> > SfxMenuCtrlArr_Impl; class SAL_DLLPUBLIC_EXPORT SfxVirtualMenu { diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index cdf4752a63d0..dc3b36f6da6c 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -366,7 +366,7 @@ void SfxVirtualMenu::CreateFromSVMenu() pPopup = nullptr; SfxMenuCtrlArr_Impl &rCtrlArr = GetAppCtrl_Impl(); - rCtrlArr.push_back(pMnuCtrl); + rCtrlArr.push_back(std::unique_ptr<SfxMenuControl>(pMnuCtrl)); (pItems+nPos)->Bind( nullptr, nSlotId, sItemText, *pBindings); pMnuCtrl->Bind( this, nSlotId, sItemText, *pBindings); @@ -409,7 +409,7 @@ void SfxVirtualMenu::CreateFromSVMenu() if ( pMnuCtrl ) { SfxMenuCtrlArr_Impl &rCtrlArr = GetAppCtrl_Impl(); - rCtrlArr.push_back(pMnuCtrl); + rCtrlArr.push_back(std::unique_ptr<SfxMenuControl>(pMnuCtrl)); (pItems+nPos)->Bind( nullptr, nSlotId, sItemText, *pBindings); } } @@ -421,7 +421,7 @@ void SfxVirtualMenu::CreateFromSVMenu() if ( pMnuCtrl ) { SfxMenuCtrlArr_Impl &rCtrlArr = GetAppCtrl_Impl(); - rCtrlArr.push_back(pMnuCtrl); + rCtrlArr.push_back(std::unique_ptr<SfxMenuControl>(pMnuCtrl)); (pItems+nPos)->Bind( nullptr, nSlotId, sItemText, *pBindings); } else @@ -691,10 +691,10 @@ void SfxVirtualMenu::BindControllers() for (SfxMenuCtrlArr_Impl::iterator i = rCtrlArr.begin(); i != rCtrlArr.end(); ++i) { - sal_uInt16 nSlotId = i->GetId(); + sal_uInt16 nSlotId = (*i)->GetId(); if (pSVMenu->GetItemCommand(nSlotId).isEmpty()) { - i->ReBind(); + (*i)->ReBind(); } } @@ -718,10 +718,10 @@ void SfxVirtualMenu::UnbindControllers() for (SfxMenuCtrlArr_Impl::iterator i = rCtrlArr.begin(); i != rCtrlArr.end(); ++i) { - if (i->IsBound()) + if ((*i)->IsBound()) { // UnoController is not bound! - i->UnBind(); + (*i)->UnBind(); } } |