diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-23 23:47:46 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-24 10:58:57 +0200 |
| commit | 22fd35f5987e3fed40d5b2ad0df35f7d89f842f8 (patch) | |
| tree | b8f0d3caa268cd03edc2dd132be5490708c38593 /include/filter/msfilter | |
| parent | b772f022192d2150aa6b33b1ce086c4645277023 (diff) | |
filter: replace boost::ptr_vector with std::vector<std::unique_ptr>
Change-Id: I9aa0543edf3f0aef3a0a376aa0f82f51c6d93313
Diffstat (limited to 'include/filter/msfilter')
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 14fa1e5e2a24..f3ce6b58627c 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -27,8 +27,6 @@ #include <set> #include <vector> -#include <boost/ptr_container/ptr_vector.hpp> - #include <com/sun/star/uno/Reference.h> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -110,7 +108,7 @@ typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer; #define SVEXT_PERSIST_STREAM "\002OlePres000" /// the following will be sorted by the order of their appearance: -typedef boost::ptr_vector<SvxMSDffShapeOrder> SvxMSDffShapeOrders; +typedef std::vector<std::unique_ptr<SvxMSDffShapeOrder>> SvxMSDffShapeOrders; struct MSFILTER_DLLPUBLIC CompareSvxMSDffShapeInfoById { @@ -402,7 +400,7 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader SvxMSDffBLIPInfos* m_pBLIPInfos; std::unique_ptr<SvxMSDffShapeInfos_ByTxBxComp> m_xShapeInfosByTxBxComp; std::unique_ptr<SvxMSDffShapeInfos_ById> m_xShapeInfosById; - SvxMSDffShapeOrders* pShapeOrders; + SvxMSDffShapeOrders* m_pShapeOrders; sal_uInt32 nOffsDgg; sal_uInt16 nBLIPCount; sal_uInt32 nGroupShapeFlags; @@ -675,7 +673,7 @@ public: { return m_xShapeInfosById.get(); } inline SvxMSDffShapeOrders* GetShapeOrders() const - { return pShapeOrders; } + { return m_pShapeOrders; } void StoreShapeOrder(sal_uLong nId, sal_uLong nTxBx, |