diff options
| author | Noel Grandin <noel@peralex.com> | 2012-07-27 19:57:22 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-27 20:08:45 +0200 |
| commit | 3ae618f9e4c34d5f6f10d953e3fb074018001748 (patch) | |
| tree | ff2fb6a6799ff98295c6939c4bf1c8980754e093 /filter/inc | |
| parent | 7a1fe4a086ba617a43012c6fabf7727a1eb49b43 (diff) | |
convert SvxMSDffShapeInfos to sorted_vector
... with some fixes from the committer.
Change-Id: I9408d8b7c80aff1d1fdb23b852b79bfee7dc4c95
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index e127aa8f5107..6b20aaa7aa28 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <tools/solar.h> -#include <svl/svarray.hxx> #include <tools/color.hxx> #include <tools/gen.hxx> #include <svx/msdffdef.hxx> @@ -46,6 +45,7 @@ #include <set> #include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_set.hpp> +#include <o3tl/sorted_vector.hxx> class Graphic; class SvStream; @@ -177,7 +177,6 @@ public: #define COL_DEFAULT RGB_COLORDATA( 0xFA, 0xFB, 0xFC ) -typedef SvxMSDffShapeInfo* SvxMSDffShapeInfo_Ptr; typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer; #define SVEXT_PERSIST_STREAM "\002OlePres000" @@ -191,7 +190,16 @@ public: }; // the following will be sorted explicitly: -SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxMSDffShapeInfos, SvxMSDffShapeInfo_Ptr, 16, MSFILTER_DLLPUBLIC ) +class SvxMSDffShapeInfos + : public o3tl::sorted_vector<SvxMSDffShapeInfo*, + o3tl::less_ptr_to<SvxMSDffShapeInfo> > +{ +public: + ~SvxMSDffShapeInfos() + { + DeleteAndDestroyAll(); + } +}; #define SVXMSDFF_SETTINGS_CROP_BITMAPS 1 #define SVXMSDFF_SETTINGS_IMPORT_PPT 2 |