diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-12 13:41:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-12 14:12:32 +0200 |
| commit | 8edb5996089a24c6eb0509a7ee4d108a23203752 (patch) | |
| tree | df6c8507a01f1795ff2ec4498bfd8141d05b1e2d /filter/inc | |
| parent | c98829262fdfcd86e8e8c233319ece566af0b9c0 (diff) | |
fix previous STL conversion commit:
the MSDffImportRecords now leaks memory, so use a boost::ptr_set
instead, that also doesn't seem to need a special comparator class.
Change-Id: I52935205a57cfb03f439d83401b80b1bf69ede47
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 7c7bc7d25a23..162667152ff0 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -45,6 +45,7 @@ #include <vector> #include <set> #include <boost/ptr_container/ptr_vector.hpp> +#include <boost/ptr_container/ptr_set.hpp> class Graphic; class SvStream; @@ -329,11 +330,9 @@ private: }; /** list of all SvxMSDffImportRec instances of/for a group */ -struct CompareMSDffImportRecords -{ - bool operator()( SvxMSDffImportRec* const& lhs, SvxMSDffImportRec* const& rhs ) const { return (*lhs)<(*rhs); } -}; -class MSFILTER_DLLPUBLIC MSDffImportRecords : public std::set<SvxMSDffImportRec*,CompareMSDffImportRecords> {}; +class MSFILTER_DLLPUBLIC MSDffImportRecords + : public ::boost::ptr_set<SvxMSDffImportRec> +{}; /** block of parameters for import/export for a single call of ImportObjAtCurrentStreamPos() */ |