diff options
Diffstat (limited to 'tools/inc/tools/list.hxx')
| -rw-r--r-- | tools/inc/tools/list.hxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx index dd8fbf454f80..bb0d8627838c 100644 --- a/tools/inc/tools/list.hxx +++ b/tools/inc/tools/list.hxx @@ -56,18 +56,18 @@ public: using Container::Next; using Container::Prev; - List( USHORT _nInitSize = 16, USHORT _nReSize = 16 ) : + List( sal_uInt16 _nInitSize = 16, sal_uInt16 _nReSize = 16 ) : Container( 1024, _nInitSize, _nReSize ) {} - List( USHORT _nBlockSize, USHORT _nInitSize, USHORT _nReSize ) : + List( sal_uInt16 _nBlockSize, sal_uInt16 _nInitSize, sal_uInt16 _nReSize ) : Container( _nBlockSize, _nInitSize, _nReSize ) {} List( const List& rList ) : Container( rList ) {} List& operator =( const List& rList ) { Container::operator =( rList ); return *this; } - BOOL operator ==( const List& rList ) const + sal_Bool operator ==( const List& rList ) const { return Container::operator ==( rList ); } - BOOL operator !=( const List& rList ) const + sal_Bool operator !=( const List& rList ) const { return Container::operator !=( rList ); } }; @@ -83,16 +83,16 @@ public: \ using List::Count; \ using List::GetCurPos; \ \ - ClassName( USHORT _nInitSize = 16, \ - USHORT _nReSize = 16 ) : \ + ClassName( sal_uInt16 _nInitSize = 16, \ + sal_uInt16 _nReSize = 16 ) : \ List( _nInitSize, _nReSize ) {} \ - ClassName( USHORT _nBlockSize, USHORT _nInitSize, \ - USHORT _nReSize ) : \ + ClassName( sal_uInt16 _nBlockSize, sal_uInt16 _nInitSize, \ + sal_uInt16 _nReSize ) : \ List( _nBlockSize, _nInitSize, _nReSize ) {} \ ClassName( const ClassName& rClassName ) : \ List( rClassName ) {} \ \ - void Insert( Type p, ULONG nIndex ) \ + void Insert( Type p, sal_uIntPtr nIndex ) \ { List::Insert( (void*)p, nIndex ); } \ void Insert( Type p ) \ { List::Insert( (void*)p ); } \ @@ -100,13 +100,13 @@ public: \ { List::Insert( (void*)pNew, (void*)pOld ); } \ Type Remove() \ { return (Type)List::Remove(); } \ - Type Remove( ULONG nIndex ) \ + Type Remove( sal_uIntPtr nIndex ) \ { return (Type)List::Remove( nIndex ); } \ Type Remove( Type p ) \ { return (Type)List::Remove( (void*)p ); } \ Type Replace( Type p ) \ { return (Type)List::Replace( (void*)p ); } \ - Type Replace( Type p, ULONG nIndex ) \ + Type Replace( Type p, sal_uIntPtr nIndex ) \ { return (Type)List::Replace( (void*)p, nIndex ); } \ Type Replace( Type pNew, Type pOld ) \ { return (Type)List::Replace( (void*)pNew, \ @@ -114,16 +114,16 @@ public: \ \ Type GetCurObject() const \ { return (Type)List::GetCurObject(); } \ - Type GetObject( ULONG nIndex ) const \ + Type GetObject( sal_uIntPtr nIndex ) const \ { return (Type)List::GetObject( nIndex ); } \ - ULONG GetPos( const Type p ) const \ + sal_uIntPtr GetPos( const Type p ) const \ { return List::GetPos( (const void*)p ); } \ - ULONG GetPos( const Type p, ULONG nStartIndex, \ - BOOL bForward = TRUE ) const \ + sal_uIntPtr GetPos( const Type p, sal_uIntPtr nStartIndex, \ + sal_Bool bForward = sal_True ) const \ { return List::GetPos( (const void*)p, nStartIndex, \ bForward ); } \ \ - Type Seek( ULONG nIndex ) \ + Type Seek( sal_uIntPtr nIndex ) \ { return (Type)List::Seek( nIndex ); } \ Type Seek( void* p ) { return (Type)List::Seek( p ); } \ Type First() { return (Type)List::First(); } \ @@ -134,9 +134,9 @@ public: \ ClassName& operator =( const ClassName& rClassName ) \ { List::operator =( rClassName ); return *this; } \ \ - BOOL operator ==( const ClassName& rList ) const \ + sal_Bool operator ==( const ClassName& rList ) const \ { return List::operator ==( rList ); } \ - BOOL operator !=( const ClassName& rList ) const \ + sal_Bool operator !=( const ClassName& rList ) const \ { return List::operator !=( rList ); } \ }; |