diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-11 17:21:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-12 23:25:09 +0200 |
| commit | 9536a28ede89e8c29940e8ba225215a45667062c (patch) | |
| tree | 8ef6e341ad4c9756ed2cb63f19c1168fa06904c3 /filter/inc | |
| parent | Convert SV_DECL_PTRARR_DEL(PptFontEntityAtomList) to boost::ptr_vector (diff) | |
| download | core-9536a28ede89e8c29940e8ba225215a45667062c.tar.gz core-9536a28ede89e8c29940e8ba225215a45667062c.zip | |
Convert SV_DECL_PTRARR_DEL(_PptSlidePersistList) to std::vector
I could have used boost::ptr_vector, but the code seems to believe
that the array can contain nulls, which ptr_vector does not like.
Change-Id: I5f56a3e96ef9baca2c192e7cfa33b8f4283709a6
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/svdfppt.hxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx index 8a6d1edbc452..d2fb3b1ff7ff 100644 --- a/filter/inc/filter/msfilter/svdfppt.hxx +++ b/filter/inc/filter/msfilter/svdfppt.hxx @@ -30,7 +30,6 @@ #define _SVDFPPT_HXX #include <tools/solar.h> -#include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/gen.hxx> #include <tools/color.hxx> @@ -351,7 +350,15 @@ public: sal_uInt32 GetSlideId() const { return aPersistAtom.nSlideId; } }; -SV_DECL_PTRARR_DEL(_PptSlidePersistList,PptSlidePersistEntry*,16) +class _PptSlidePersistList : public std::vector<PptSlidePersistEntry*> +{ +public: + ~_PptSlidePersistList() + { + for( const_iterator it = begin(); it != end(); ++it ) + delete *it; + } +}; #define PPTSLIDEPERSIST_ENTRY_NOTFOUND 0xFFFF |