summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-10 14:44:43 +0200
committerNoel Grandin <noel@peralex.com>2015-11-10 15:30:03 +0200
commitc1cd376c2830f626ebfde9585b9ddb93ce603b48 (patch)
treee933fb945471843c494480025318ed2823c16174 /editeng
parenta249cfc2bcc7f4e5784b47581327c99e551d0e55 (diff)
editeng: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I7a49ed58cb20c365308db703c67e43c6687f35e4
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editobj.cxx4
-rw-r--r--editeng/source/editeng/editobj2.hxx3
2 files changed, 4 insertions, 3 deletions
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index b607b1f4ac97..f2b7c97d2631 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -105,12 +105,12 @@ XParaPortionList::XParaPortionList(
void XParaPortionList::push_back(XParaPortion* p)
{
- maList.push_back(p);
+ maList.push_back(std::unique_ptr<XParaPortion>(p));
}
const XParaPortion& XParaPortionList::operator [](size_t i) const
{
- return maList[i];
+ return *maList[i].get();
}
ContentInfo::ContentInfo( SfxItemPool& rPool ) :
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 33b709385ac8..f732aaadd003 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -31,6 +31,7 @@
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/noncopyable.hpp>
#include <memory>
+#include <vector>
namespace editeng {
@@ -98,7 +99,7 @@ struct XParaPortion
class XParaPortionList
{
- typedef boost::ptr_vector<XParaPortion> ListType;
+ typedef std::vector<std::unique_ptr<XParaPortion> > ListType;
ListType maList;
sal_uIntPtr nRefDevPtr;