diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-11 11:22:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-11 11:35:43 +0200 |
| commit | 8978ce53e16de9a597015b0704f813dffa7da920 (patch) | |
| tree | 3259d9a9dac42df76e5186b5b97ac2cf339acf05 /svx | |
| parent | 44d3577f4b5ec181219268826d2ec504e61541f3 (diff) | |
svx: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: Ib4ebadcdecc0f673c585c820b4aa4a3e1e123f0c
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 4 | ||||
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 0c6e7c2ad611..b1d59bf1ae1f 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -95,6 +95,7 @@ #include <vcl/layout.hxx> #include <vcl/waitobj.hxx> #include <vcl/settings.hxx> +#include <o3tl/make_unique.hxx> #include <algorithm> #include <functional> @@ -4036,8 +4037,7 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI for (sal_Int16 i=0; i<m_pConversionMenu->GetItemCount(); ++i) { _rBindings.Invalidate(m_pConversionMenu->GetItemId(i)); - SfxStatusForwarder* pForwarder = new SfxStatusForwarder(m_pConversionMenu->GetItemId(i), *this); - m_aStatusForwarders.push_back(pForwarder); + m_aStatusForwarders.push_back(o3tl::make_unique<SfxStatusForwarder>(m_pConversionMenu->GetItemId(i), *this)); } } } diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index ccacff49ea5a..e15235c8241e 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -61,7 +61,7 @@ #include <queue> #include <set> #include <vector> -#include <boost/ptr_container/ptr_vector.hpp> +#include <memory> typedef std::vector< css::uno::Reference< css::form::XForm > > FmFormArray; @@ -571,7 +571,7 @@ public: class SVX_DLLPUBLIC ControlConversionMenuController : public SfxMenuControl { protected: - boost::ptr_vector<SfxStatusForwarder> m_aStatusForwarders; + std::vector<std::unique_ptr<SfxStatusForwarder> > m_aStatusForwarders; Menu* m_pMainMenu; PopupMenu* m_pConversionMenu; |