diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-12 08:42:28 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-12 23:25:09 +0200 |
| commit | e19a2e50b723e0871d10cb51198d82c3dc8e57fa (patch) | |
| tree | 4293005023e070d931422fb3c04aa40a7ecb3030 /filter/inc | |
| parent | Convert SV_DECL_PTRARR_DEL(_PptSlidePersistList) to std::vector (diff) | |
| download | core-e19a2e50b723e0871d10cb51198d82c3dc8e57fa.tar.gz core-e19a2e50b723e0871d10cb51198d82c3dc8e57fa.zip | |
Convert SV_DECL_PTRARR_DEL(SvxMSDffShapeOrders) to std::vector
I could not use boost::ptr_vector because some of the code copies
the pointers into other data-structures temporarily, which
ptr_vector does not like.
Change-Id: Ie9c8aeb4e741bfd138694929ccda451a1c0984bb
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index db15f86c8517..f5371d788388 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -181,8 +181,6 @@ typedef SvxMSDffBLIPInfo* SvxMSDffBLIPInfo_Ptr; typedef SvxMSDffShapeInfo* SvxMSDffShapeInfo_Ptr; -typedef SvxMSDffShapeOrder* SvxMSDffShapeOrder_Ptr; - typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer; #define SVEXT_PERSIST_STREAM "\002OlePres000" @@ -190,12 +188,16 @@ typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer; // nach der Reihenfolge des Auftretens sortiert werden: SV_DECL_PTRARR_DEL(SvxMSDffBLIPInfos, SvxMSDffBLIPInfo_Ptr, 16) -SV_DECL_PTRARR_DEL(SvxMSDffShapeOrders, SvxMSDffShapeOrder_Ptr, 16) +class SvxMSDffShapeOrders : public std::vector<SvxMSDffShapeOrder*> +{ +public: + ~SvxMSDffShapeOrders(); +}; // explizit sortiert werden: SV_DECL_PTRARR_SORT_DEL_VISIBILITY(SvxMSDffShapeInfos, SvxMSDffShapeInfo_Ptr, 16, MSFILTER_DLLPUBLIC) -SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort, SvxMSDffShapeOrder_Ptr, 16, MSFILTER_DLLPUBLIC) +SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort, SvxMSDffShapeOrder*, 16, MSFILTER_DLLPUBLIC) #define SVXMSDFF_SETTINGS_CROP_BITMAPS 1 #define SVXMSDFF_SETTINGS_IMPORT_PPT 2 |