diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-11 12:05:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 08:01:34 +0200 |
| commit | 51f9d14ae75bb01ebb79a5ed85eecabc794da490 (patch) | |
| tree | 3a5904ed4c2175fb62e45fdfc9f4f07aa982c990 /sfx2 | |
| parent | 8acacaede11b35c853659526d3c77cc5a9f05b3a (diff) | |
sfx2: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I9e4942a0b5c3f6f863b3fa35bf0cc30911944724
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/childwinimpl.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/inc/childwinimpl.hxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/appl/childwinimpl.cxx b/sfx2/source/appl/childwinimpl.cxx index 806084df4420..7e8b0b7aa68c 100644 --- a/sfx2/source/appl/childwinimpl.cxx +++ b/sfx2/source/appl/childwinimpl.cxx @@ -46,17 +46,17 @@ size_t SfxChildWinFactArr_Impl::size() const const SfxChildWinFactory& SfxChildWinFactArr_Impl::operator []( size_t i ) const { - return maData[i]; + return *maData[i].get(); } SfxChildWinFactory& SfxChildWinFactArr_Impl::operator []( size_t i ) { - return maData[i]; + return *maData[i].get(); } void SfxChildWinFactArr_Impl::push_back( SfxChildWinFactory* p ) { - maData.push_back(p); + maData.push_back(std::unique_ptr<SfxChildWinFactory>(p)); } void SfxChildWinFactArr_Impl::erase( iterator it ) diff --git a/sfx2/source/inc/childwinimpl.hxx b/sfx2/source/inc/childwinimpl.hxx index 0838b3791153..113268687db2 100644 --- a/sfx2/source/inc/childwinimpl.hxx +++ b/sfx2/source/inc/childwinimpl.hxx @@ -22,7 +22,6 @@ #include <sfx2/childwin.hxx> -#include <boost/ptr_container/ptr_vector.hpp> #include <vector> #include <memory> @@ -42,7 +41,7 @@ public: class SfxChildWinFactArr_Impl { - typedef boost::ptr_vector<SfxChildWinFactory> DataType; + typedef std::vector<std::unique_ptr<SfxChildWinFactory> > DataType; DataType maData; public: |