diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-23 23:20:34 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-24 10:58:56 +0200 |
| commit | 355865211c50303095582f6e1dfbd5d209802b7b (patch) | |
| tree | be10711fdd04c8f67d7f8ef2ee43de2104c4c6d5 /include | |
| parent | 0de2d916dcee1f3afe0e71c3432b99855cf843f1 (diff) | |
filter: replace boost::ptr_set with std::set<std::unique_ptr>
Change-Id: I171fdb41bef4a7f3ef6418d81a1d99f123c0652c
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index b60847a0568c..5ef4b5c9b6f8 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -28,7 +28,6 @@ #include <vector> #include <boost/ptr_container/ptr_vector.hpp> -#include <boost/ptr_container/ptr_set.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/embed/XEmbeddedObject.hpp> @@ -270,16 +269,21 @@ private: SvxMSDffImportRec &operator=(const SvxMSDffImportRec&) SAL_DELETED_FUNCTION; }; +struct MSDffImportRecords_Less +{ + bool operator()(std::unique_ptr<SvxMSDffImportRec> const& left, + std::unique_ptr<SvxMSDffImportRec> const& right) const + { return (*left) < (*right); } +}; /** list of all SvxMSDffImportRec instances of/for a group */ -class MSDffImportRecords - : public ::boost::ptr_set<SvxMSDffImportRec> -{}; +typedef std::set<std::unique_ptr<SvxMSDffImportRec>, MSDffImportRecords_Less> + MSDffImportRecords; /** block of parameters for import/export for a single call of ImportObjAtCurrentStreamPos() */ struct SvxMSDffImportData { - MSDffImportRecords aRecords; ///< Shape pointer, Shape ids and private data + MSDffImportRecords m_Records; ///< Shape pointer, Shape ids and private data Rectangle aParentRect;///< Rectangle of the surrounding groups, ///< which might have been provided externally Rectangle aNewRect; ///< Rectangle that is defined by this shape @@ -287,10 +291,10 @@ struct SvxMSDffImportData SvxMSDffImportData() {} explicit SvxMSDffImportData( const Rectangle& rParentRect ) : aParentRect( rParentRect ) {} - bool empty() const { return aRecords.empty(); } - size_t size() const { return aRecords.size(); } - MSDffImportRecords::const_iterator begin() const { return aRecords.begin(); } - MSDffImportRecords::const_iterator end() const { return aRecords.end(); } + bool empty() const { return m_Records.empty(); } + size_t size() const { return m_Records.size(); } + MSDffImportRecords::const_iterator begin() const { return m_Records.begin(); } + MSDffImportRecords::const_iterator end() const { return m_Records.end(); } }; struct DffObjData |