diff options
| author | Noel Grandin <noel@peralex.com> | 2012-07-13 15:18:57 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-17 15:33:33 +0200 |
| commit | fbabbcefd8f8575c7b08c7a7ac7fe0b665038214 (patch) | |
| tree | 9b8e1dc00c3571db85e9b942f9d6656880ec59a9 /sw/source/filter/html/htmlfly.hxx | |
| parent | 22461ae3712fa77a18be99fe76d6f0531058e388 (diff) | |
Convert SV_DECL_PTRARR_SORT(SwHTMLPosFlyFrms) to o3tl::sorted_vector
Change-Id: If745de5e44ffffca27166f3ac6f35877189d50a7
Diffstat (limited to 'sw/source/filter/html/htmlfly.hxx')
| -rw-r--r-- | sw/source/filter/html/htmlfly.hxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx index 5e0d945cfd92..81f3ced870e6 100644 --- a/sw/source/filter/html/htmlfly.hxx +++ b/sw/source/filter/html/htmlfly.hxx @@ -30,8 +30,7 @@ #define _HTMLFLY_HXX #include <tools/solar.h> - -#include <svl/svarray.hxx> +#include <o3tl/sorted_vector.hxx> class SdrObject; class SwFrmFmt; @@ -107,8 +106,8 @@ public: SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly, const SdrObject *pSdrObj, sal_uInt8 nOutMode ); - sal_Bool operator==( const SwHTMLPosFlyFrm& ) const { return sal_False; } - sal_Bool operator<( const SwHTMLPosFlyFrm& ) const; + bool operator==( const SwHTMLPosFlyFrm& ) const { return false; } + bool operator<( const SwHTMLPosFlyFrm& ) const; const SwFrmFmt& GetFmt() const { return *pFrmFmt; } const SdrObject *GetSdrObject() const { return pSdrObject; } @@ -128,9 +127,7 @@ public: sal_uInt8 GetOutCntnr() const { return nOutputMode & HTML_CNTNR_MASK; } }; -typedef SwHTMLPosFlyFrm *SwHTMLPosFlyFrmPtr; -SV_DECL_PTRARR_SORT( SwHTMLPosFlyFrms, SwHTMLPosFlyFrmPtr, 10 ) - +class SwHTMLPosFlyFrms : public o3tl::sorted_vector<SwHTMLPosFlyFrm*, o3tl::less_ptr_to<SwHTMLPosFlyFrm> > {}; #endif |