summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2012-07-29 12:33:07 +0200
committerThomas Arnhold <thomas@arnhold.org>2012-07-29 12:33:07 +0200
commita5a1b5d07b6e614b71a344589470ae89b15a5bac (patch)
tree6dce99b6e1146568ba6d634cca02e56420ddc36d /svl
parentf7361d77d5bee4ff30ea6b0028eeb022bf60de83 (diff)
svarray.hxx: clean out much more cruft
Change-Id: Id506fdcd832aca1f55b2406d9232a55ed55e6c19
Diffstat (limited to 'svl')
-rw-r--r--svl/inc/svl/svarray.hxx90
1 files changed, 0 insertions, 90 deletions
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 12e31a8163ba..4aebb4a2dfeb 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -109,60 +109,6 @@ private:\
#define SV_DECL_PTRARR_VISIBILITY(nm, AE, IS, vis)\
SV_DECL_PTRARR_GEN(nm, AE, IS, SvPtrarr, AE &, VoidPtr &, vis )
-#define SV_DECL_PTRARR_DEL_GEN(nm, AE, IS, Base, AERef, VPRef, vis )\
-class vis nm: public Base \
-{\
-public:\
- nm( sal_uInt16 nIni=IS )\
- : Base(nIni) {}\
- ~nm() { DeleteAndDestroy( 0, Count() ); }\
- void Insert( const nm *pI, sal_uInt16 nP, \
- sal_uInt16 nS = 0, sal_uInt16 nE = USHRT_MAX ) {\
- Base::Insert((const Base*)pI, nP, nS, nE);\
- }\
- void Insert( const AERef aE, sal_uInt16 nP ) {\
- Base::Insert((const VPRef)aE, nP );\
- }\
- void Insert( const AE *pE, sal_uInt16 nL, sal_uInt16 nP ) {\
- Base::Insert( (const VoidPtr *)pE, nL, nP );\
- }\
- void Replace( const AERef aE, sal_uInt16 nP ) {\
- Base::Replace( (const VPRef)aE, nP );\
- }\
- void Replace( const AE *pE, sal_uInt16 nL, sal_uInt16 nP ) {\
- Base::Replace( (const VoidPtr*)pE, nL, nP );\
- }\
- void Remove( sal_uInt16 nP, sal_uInt16 nL = 1) {\
- Base::Remove(nP,nL);\
- }\
- const AE* GetData() const {\
- return (const AE*)Base::GetData();\
- }\
- AE operator[]( sal_uInt16 nP )const { \
- return (AE)Base::operator[](nP); }\
- AE GetObject( sal_uInt16 nP )const { \
- return (AE)Base::GetObject(nP); }\
- \
- sal_uInt16 GetPos( const AERef aE ) const { \
- return Base::GetPos((const VPRef)aE);\
- } \
- void DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL=1 );\
-private:\
- nm( const nm& );\
- nm& operator=( const nm& );\
-};
-
-#define SV_IMPL_PTRARR_GEN(nm, AE, Base)\
-void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )\
-{ \
- if( nL ) {\
- OSL_ENSURE( nP < nA && nP + nL <= nA,"Del");\
- for( sal_uInt16 n=nP; n < nP + nL; n++ ) \
- delete *((AE*)pData+n); \
- Base::Remove( nP, nL ); \
- } \
-}
-
typedef void* VoidPtr;
typedef sal_Bool (*FnForEach_SvPtrarr)( const VoidPtr&, void* );
class SVL_DLLPUBLIC SvPtrarr
@@ -299,38 +245,6 @@ sal_Bool nm::Seek_Entry( const AE aE, sal_uInt16* pP ) const\
return sal_False;\
}
-#define _SV_SEEK_OBJECT( nm,AE )\
-sal_Bool nm::Seek_Entry( const AE & aE, sal_uInt16* pP ) const\
-{\
- register sal_uInt16 nO = nm##_SAR::Count(),\
- nM, \
- nU = 0;\
- if( nO > 0 )\
- {\
- nO--;\
- while( nU <= nO )\
- {\
- nM = nU + ( nO - nU ) / 2;\
- if( *(pData + nM) == aE )\
- {\
- if( pP ) *pP = nM;\
- return sal_True;\
- }\
- else if( *(pData + nM) < aE )\
- nU = nM + 1;\
- else if( nM == 0 )\
- {\
- if( pP ) *pP = nU;\
- return sal_False;\
- }\
- else\
- nO = nM - 1;\
- }\
- }\
- if( pP ) *pP = nU;\
- return sal_False;\
-}
-
#define _SV_IMPL_SORTAR_ALG(nm, AE)\
void nm::Insert( const nm * pI, sal_uInt16 nS, sal_uInt16 nE )\
{\
@@ -454,13 +368,9 @@ _SV_SEEK_PTR_TO_OBJECT( nm,AE )
#if defined(ICC) || defined(GCC) || (defined(WNT) && _MSC_VER >= 1400)
#define C40_INSERT( c, p, n ) Insert( (c const *&) p, n )
-#define C40_PTR_INSERT( c, p ) Insert( (c const *&) p )
-#define C40_REPLACE( c, p, n ) Replace( (c const *&) p, n )
#define C40_GETPOS( c, r) GetPos( (c const *&) r )
#else
#define C40_INSERT( c, p, n ) Insert( p, n )
-#define C40_PTR_INSERT( c, p ) Insert( p )
-#define C40_REPLACE( c, p, n ) Replace( p, n )
#define C40_GETPOS( c, r) GetPos( r )
#endif