diff options
Diffstat (limited to 'tools/inc/tools/contnr.hxx')
-rw-r--r-- | tools/inc/tools/contnr.hxx | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx index 5cf8e7b74569..804482afaea5 100644 --- a/tools/inc/tools/contnr.hxx +++ b/tools/inc/tools/contnr.hxx @@ -39,7 +39,7 @@ class CBlock; // ------------- // Maximale Blockgroesse -#define CONTAINER_MAXBLOCKSIZE ((USHORT)0x3FF0) +#define CONTAINER_MAXBLOCKSIZE ((sal_uInt16)0x3FF0) #define CONTAINER_APPEND ULONG_MAX #define CONTAINER_ENTRY_NOTFOUND ULONG_MAX @@ -50,11 +50,11 @@ private: CBlock* pFirstBlock; CBlock* pCurBlock; CBlock* pLastBlock; - USHORT nCurIndex; - USHORT nBlockSize; - USHORT nInitSize; - USHORT nReSize; - ULONG nCount; + sal_uInt16 nCurIndex; + sal_uInt16 nBlockSize; + sal_uInt16 nInitSize; + sal_uInt16 nReSize; + sal_uIntPtr nCount; TOOLS_DLLPRIVATE void ImpCopyContainer(Container const *); #if defined DBG_UTIL @@ -63,49 +63,49 @@ private: protected: #ifdef _IMPCONT_HXX - void ImpInsert( void* p, CBlock* pBlock, USHORT nIndex ); - void* ImpRemove( CBlock* pBlock, USHORT nIndex ); - void* ImpGetObject( ULONG nIndex ) const; + void ImpInsert( void* p, CBlock* pBlock, sal_uInt16 nIndex ); + void* ImpRemove( CBlock* pBlock, sal_uInt16 nIndex ); + void* ImpGetObject( sal_uIntPtr nIndex ) const; void** ImpGetOnlyNodes() const; #endif - void** GetObjectPtr( ULONG nIndex ); + void** GetObjectPtr( sal_uIntPtr nIndex ); public: - Container( USHORT nBlockSize, - USHORT nInitSize, - USHORT nReSize ); - Container( ULONG nSize ); + Container( sal_uInt16 nBlockSize, + sal_uInt16 nInitSize, + sal_uInt16 nReSize ); + Container( sal_uIntPtr nSize ); Container( const Container& rContainer ); ~Container(); void Insert( void* p ); - void Insert( void* p, ULONG nIndex ); + void Insert( void* p, sal_uIntPtr nIndex ); void Insert( void* pNew, void* pOld ); void* Remove(); - void* Remove( ULONG nIndex ); + void* Remove( sal_uIntPtr nIndex ); void* Remove( void* p ) { return Remove( GetPos( p ) ); } void* Replace( void* p ); - void* Replace( void* p, ULONG nIndex ); + void* Replace( void* p, sal_uIntPtr nIndex ); void* Replace( void* pNew, void* pOld ) { return Replace( pNew, GetPos( pOld ) ); } - void SetSize( ULONG nNewSize ); - ULONG GetSize() const { return nCount; } + void SetSize( sal_uIntPtr nNewSize ); + sal_uIntPtr GetSize() const { return nCount; } - ULONG Count() const { return nCount; } + sal_uIntPtr Count() const { return nCount; } void Clear(); void* GetCurObject() const; - ULONG GetCurPos() const; - void* GetObject( ULONG nIndex ) const; - ULONG GetPos( const void* p ) const; - ULONG GetPos( const void* p, ULONG nStartIndex, - BOOL bForward = TRUE ) const; + sal_uIntPtr GetCurPos() const; + void* GetObject( sal_uIntPtr nIndex ) const; + sal_uIntPtr GetPos( const void* p ) const; + sal_uIntPtr GetPos( const void* p, sal_uIntPtr nStartIndex, + sal_Bool bForward = sal_True ) const; - void* Seek( ULONG nIndex ); + void* Seek( sal_uIntPtr nIndex ); void* Seek( void* p ) { return Seek( GetPos( p ) ); } void* First(); @@ -115,8 +115,8 @@ public: Container& operator =( const Container& rContainer ); - BOOL operator ==( const Container& rContainer ) const; - BOOL operator !=( const Container& rContainer ) const + sal_Bool operator ==( const Container& rContainer ) const; + sal_Bool operator !=( const Container& rContainer ) const { return !(Container::operator==( rContainer )); } }; |