From 4e46ab162a1d6b757aec3629e193e2df65c38bb7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 24 Jun 2012 00:05:10 +0100 Subject: remove unnecessary ForEach Change-Id: I53bb48c27c3b42dd73f81ed46f3c29e409d8fb47 --- svl/inc/svl/svarray.hxx | 39 --------------------------------------- unusedcode.README | 1 - 2 files changed, 40 deletions(-) diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 2a2c6a84e40e..47c30132f097 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -316,7 +316,6 @@ sal_uInt16 GetPos( const AERef aE ) const;\ _SV_DECL_PTRARR_DEF_GEN( nm, AE, IS, AE &, vis ) #define SV_DECL_PTRARR_GEN(nm, AE, IS, Base, AERef, VPRef, vis )\ -typedef sal_Bool (*FnForEach_##nm)( const AERef, void* );\ class vis nm: public Base \ {\ public:\ @@ -344,15 +343,6 @@ public:\ const AE* GetData() const {\ return (const AE*)Base::GetData();\ }\ - void ForEach( CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\ - {\ - _ForEach( 0, nA, (FnForEach_##Base)fnForEach, pArgs );\ - }\ - void ForEach( sal_uInt16 nS, sal_uInt16 nE, \ - CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\ - {\ - _ForEach( nS, nE, (FnForEach_##Base)fnForEach, pArgs );\ - }\ AE operator[]( sal_uInt16 nP )const { \ return (AE)Base::operator[](nP); }\ AE GetObject(sal_uInt16 nP) const { \ @@ -374,7 +364,6 @@ SV_DECL_PTRARR_GEN(nm, AE, IS, SvPtrarr, AE &, VoidPtr &, ) SV_DECL_PTRARR_GEN(nm, AE, IS, SvPtrarr, AE &, VoidPtr &, vis ) #define SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, Base, AERef, VPRef, vis )\ -typedef sal_Bool (*FnForEach_##nm)( const AERef, void* );\ class vis nm: public Base \ {\ public:\ @@ -403,15 +392,6 @@ public:\ const AE* GetData() const {\ return (const AE*)Base::GetData();\ }\ - void ForEach( CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\ - {\ - _ForEach( 0, nA, (FnForEach_##Base)fnForEach, pArgs );\ - }\ - void ForEach( sal_uInt16 nS, sal_uInt16 nE, \ - CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\ - {\ - _ForEach( nS, nE, (FnForEach_##Base)fnForEach, pArgs );\ - }\ AE operator[]( sal_uInt16 nP )const { \ return (AE)Base::operator[](nP); }\ AE GetObject( sal_uInt16 nP )const { \ @@ -452,7 +432,6 @@ _SV_DECL_PTRARR_DEF( SvPtrarr, VoidPtr, 0, SVL_DLLPUBLIC ) // SORTARR - Begin #define _SORT_CLASS_DEF(nm, AE, IS, vis)\ -typedef sal_Bool (*FnForEach_##nm)( const AE&, void* );\ class vis nm : private nm##_SAR \ {\ public:\ @@ -637,15 +616,6 @@ _SORT_CLASS_DEF(nm, AE, IS, vis)\ return nm##_SAR::GetObject( nP );\ }\ sal_Bool Seek_Entry( const AE aE, sal_uInt16* pP = 0 ) const;\ - void ForEach( CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\ - {\ - _ForEach( 0, nA, (FnForEach_SvPtrarr)fnForEach, pArgs );\ - }\ - void ForEach( sal_uInt16 nS, sal_uInt16 nE, \ - CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\ - {\ - _ForEach( nS, nE, (FnForEach_SvPtrarr)fnForEach, pArgs );\ - }\ void DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL=1 ); \ _SORTARR_BLC_CASTS(nm, AE )\ \ @@ -689,15 +659,6 @@ _SORT_CLASS_DEF(nm, AE, IS, vis) \ return nm##_SAR::GetObject( nP );\ }\ sal_Bool Seek_Entry( const AE & aE, sal_uInt16* pP = 0 ) const;\ - void ForEach( CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\ - {\ - _ForEach( 0, nA, (FnForEach_##nm##_SAR)fnForEach, pArgs );\ - }\ - void ForEach( sal_uInt16 nS, sal_uInt16 nE, \ - CONCAT( FnForEach_, nm ) fnForEach, void* pArgs = 0 )\ - {\ - _ForEach( nS, nE, (FnForEach_##nm##_SAR)fnForEach, pArgs );\ - }\ private:\ nm( const nm& );\ nm& operator=( const nm& );\ diff --git a/unusedcode.README b/unusedcode.README index 9159623e40cf..ee4f9b9d2d3d 100644 --- a/unusedcode.README +++ b/unusedcode.README @@ -17,7 +17,6 @@ b) At the time of writing the majority of unused code now originates via *::Insert *::Remove *::DeleteAndDestroy - *::_ForEach *::Replace c) callcatcher ignores virtuals. But implementations of "pure virtuals" are not actually virtual methods. If something is declared pure virtual -- cgit