diff options
| author | Noel Grandin <noel@peralex.com> | 2012-07-10 10:00:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-12 14:12:32 +0200 |
| commit | 1384ccd692a80f78458a7b7cd818bbd010007bab (patch) | |
| tree | 08fb3e7c012f63dbcce8a1dccea483d85768365a /filter/inc | |
| parent | 8edb5996089a24c6eb0509a7ee4d108a23203752 (diff) | |
Convert SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort) to std::set
Change-Id: I94b2cccff386ccf331ca670df17d7a738e026879
Diffstat (limited to 'filter/inc')
| -rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index 162667152ff0..24137ad8001a 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -190,9 +190,8 @@ public: ~SvxMSDffShapeOrders(); }; -// the following two will be sorted explicitly: +// the following will be sorted explicitly: SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvxMSDffShapeInfos, SvxMSDffShapeInfo_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 @@ -864,12 +863,20 @@ struct SvxMSDffShapeOrder SvxMSDffShapeOrder( sal_uLong nId ): nShapeId( nId ), nTxBxComp( 0 ), pFly( 0 ), nHdFtSection( 0 ), pObj( 0 ){} - sal_Bool operator==( const SvxMSDffShapeOrder& rEntry ) const + bool operator==( const SvxMSDffShapeOrder& rEntry ) const { return (nTxBxComp == rEntry.nTxBxComp); } - sal_Bool operator<( const SvxMSDffShapeOrder& rEntry ) const + bool operator<( const SvxMSDffShapeOrder& rEntry ) const { return (nTxBxComp < rEntry.nTxBxComp); } }; +// the following will be sorted explicitly: +struct CompareSvxMSDffShapeTxBxSort +{ + bool operator()( SvxMSDffShapeOrder* const& lhs, SvxMSDffShapeOrder* const& rhs ) const { return (*lhs)<(*rhs); } +}; +class MSFILTER_DLLPUBLIC SvxMSDffShapeTxBxSort : public std::set<SvxMSDffShapeOrder*,CompareSvxMSDffShapeTxBxSort> {}; + + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |