diff options
Diffstat (limited to 'svl/inc/svl/svarray.hxx')
| -rw-r--r-- | svl/inc/svl/svarray.hxx | 38 |
1 files changed, 8 insertions, 30 deletions
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 19ee3a9e5077..7e5e8868f58a 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,8 +29,7 @@ #ifndef _SVARRAY_HXX #define _SVARRAY_HXX -#if 0 -*********************************************************************** +/*********************************************************************** * * Hier folgt die Beschreibung fuer die exportierten Makros: * @@ -81,12 +81,11 @@ * Sortierung mit Hilfe der Object-operatoren "<" und "==" * * JP 09.10.96: vordefinierte Arrays: -* VarArr: SvBools, SvULongs, SvUShorts, SvLongs, SvShorts +* VarArr: SvULongs, SvUShorts * PtrArr: SvStrings, SvStringsDtor * SortArr: SvStringsSort, SvStringsSortDtor, * SvStringsISort, SvStringsISortDtor -*********************************************************************** -#endif +***********************************************************************/ #include "svl/svldllapi.h" @@ -457,15 +456,9 @@ _SV_DECL_PTRARR_DEF( SvPtrarr, VoidPtr, 0, 1, SVL_DLLPUBLIC ) // SORTARR - Begin -#ifdef __MWERKS__ -#define __MWERKS__PRIVATE public -#else -#define __MWERKS__PRIVATE private -#endif - #define _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\ typedef sal_Bool (*FnForEach_##nm)( const AE&, void* );\ -class vis nm : __MWERKS__PRIVATE nm##_SAR \ +class vis nm : private nm##_SAR \ {\ public:\ nm(sal_uInt16 nSize = IS, sal_uInt8 nG = GS)\ @@ -634,28 +627,11 @@ void nm::Remove( const AE &aE, sal_uInt16 nL )\ nm##_SAR::Remove( nP, nL);\ }\ -#if defined(TCPP) - -#define _SORTARR_BLC_CASTS(nm, AE )\ - sal_Bool Insert( AE &aE ) {\ - return Insert( (const AE&)aE );\ - }\ - sal_uInt16 GetPos( AE& aE ) const { \ - return SvPtrarr::GetPos((const VoidPtr&)aE);\ - }\ - void Remove( AE& aE, sal_uInt16 nL = 1 ) { \ - Remove( (const AE&) aE, nL );\ - } - -#else - #define _SORTARR_BLC_CASTS(nm, AE )\ sal_uInt16 GetPos( const AE& aE ) const { \ return SvPtrarr::GetPos((const VoidPtr&)aE);\ } -#endif - #define _SV_DECL_PTRARR_SORT_ALG(nm, AE, IS, GS, vis)\ SV_DECL_PTRARR_VISIBILITY(nm##_SAR, AE, IS, GS, vis)\ _SORT_CLASS_DEF(nm, AE, IS, GS, vis)\ @@ -773,7 +749,7 @@ _SV_SEEK_OBJECT( nm,AE ) #define C40_REPLACE( c, p, n) Replace( (c const *) p, n ) #define C40_GETPOS( c, r) GetPos( (c const *)r ) #else -#if defined WTC || defined ICC || defined HPUX || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400) +#if defined ICC || (defined GCC && __GNUC__ >= 3) || (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 ) @@ -787,3 +763,5 @@ _SV_SEEK_OBJECT( nm,AE ) #endif #endif //_SVARRAY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |