diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-11 12:04:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 08:01:34 +0200 |
| commit | 8acacaede11b35c853659526d3c77cc5a9f05b3a (patch) | |
| tree | 729a882ee8ad9aed54353ff7ce82b3f83c9f5975 /sfx2 | |
| parent | 1715a995c2d57b9d5e56bc0706f1e56cdb2f732d (diff) | |
sfx2: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: Ic1ca1166874d0d90ed04b841d8143d3b10900cf5
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/childwinimpl.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/inc/childwinimpl.hxx | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx index 11b09e816fb3..806084df4420 100644 --- a/sfx2/source/appl/childwinimpl.cxx +++ b/sfx2/source/appl/childwinimpl.cxx @@ -26,17 +26,17 @@ size_t SfxChildWinContextArr_Impl::size() const const SfxChildWinContextFactory& SfxChildWinContextArr_Impl::operator []( size_t i ) const { - return maData[i]; + return *maData[i].get(); } SfxChildWinContextFactory& SfxChildWinContextArr_Impl::operator []( size_t i ) { - return maData[i]; + return *maData[i].get(); } void SfxChildWinContextArr_Impl::push_back( SfxChildWinContextFactory* p ) { - maData.push_back(p); + maData.push_back(std::unique_ptr<SfxChildWinContextFactory>(p)); } size_t SfxChildWinFactArr_Impl::size() const diff --git a/sfx2/source/inc/childwinimpl.hxx b/sfx2/source/inc/childwinimpl.hxx index e30f79f2624f..0838b3791153 100644 --- a/sfx2/source/inc/childwinimpl.hxx +++ b/sfx2/source/inc/childwinimpl.hxx @@ -23,12 +23,14 @@ #include <sfx2/childwin.hxx> #include <boost/ptr_container/ptr_vector.hpp> +#include <vector> +#include <memory> class SfxFrame; class SfxChildWinContextArr_Impl { - typedef boost::ptr_vector<SfxChildWinContextFactory> DataType; + typedef std::vector<std::unique_ptr<SfxChildWinContextFactory> > DataType; DataType maData; public: |