diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
commit | 3b6f94f9fd3ee79182e88f741a6f9d7597cc3930 (patch) | |
tree | 65a72558a8268b597e6fca70ac92302791577dc1 /tools/inc/impcont.hxx | |
parent | da7495384bf7cb1d574fc072f03a8d5e135ae108 (diff) | |
parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) |
rebase to DEV300_m100
Diffstat (limited to 'tools/inc/impcont.hxx')
-rw-r--r-- | tools/inc/impcont.hxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tools/inc/impcont.hxx b/tools/inc/impcont.hxx index 224d5a4429ef..9be0a909474d 100644 --- a/tools/inc/impcont.hxx +++ b/tools/inc/impcont.hxx @@ -42,8 +42,8 @@ class CBlock private: CBlock* pPrev; // Vorheriger Block CBlock* pNext; // Naechster Block - USHORT nSize; // Groesse des Blocks - USHORT nCount; // Anzahl Pointer + sal_uInt16 nSize; // Groesse des Blocks + sal_uInt16 nCount; // Anzahl Pointer void** pNodes; // Pointer auf die Daten #if defined DBG_UTIL @@ -52,26 +52,26 @@ private: public: // Fuer List-Container - CBlock( USHORT nSize, CBlock* pPrev, CBlock* pNext ); + CBlock( sal_uInt16 nSize, CBlock* pPrev, CBlock* pNext ); // Fuer Array-Container - CBlock( USHORT nSize, CBlock* pPrev ); + CBlock( sal_uInt16 nSize, CBlock* pPrev ); // Copy-Ctor CBlock( const CBlock& r, CBlock* pPrev ); ~CBlock(); - void Insert( void* p, USHORT nIndex, USHORT nReSize ); - CBlock* Split( void* p, USHORT nIndex, USHORT nReSize ); - void* Remove( USHORT nIndex, USHORT nReSize ); - void* Replace( void* pNew, USHORT nIndex ); + void Insert( void* p, sal_uInt16 nIndex, sal_uInt16 nReSize ); + CBlock* Split( void* p, sal_uInt16 nIndex, sal_uInt16 nReSize ); + void* Remove( sal_uInt16 nIndex, sal_uInt16 nReSize ); + void* Replace( void* pNew, sal_uInt16 nIndex ); void** GetNodes() const { return pNodes; } - void** GetObjectPtr( USHORT nIndex ); - void* GetObject( USHORT nIndex ) const; + void** GetObjectPtr( sal_uInt16 nIndex ); + void* GetObject( sal_uInt16 nIndex ) const; - void SetSize( USHORT nNewSize ); + void SetSize( sal_uInt16 nNewSize ); - USHORT GetSize() const { return nCount; } - USHORT Count() const { return nCount; } + sal_uInt16 GetSize() const { return nCount; } + sal_uInt16 Count() const { return nCount; } void SetPrevBlock( CBlock* p ) { pPrev = p; } void SetNextBlock( CBlock* p ) { pNext = p; } CBlock* GetPrevBlock() const { return pPrev; } @@ -94,7 +94,7 @@ private: |* *************************************************************************/ -inline void* CBlock::GetObject( USHORT nIndex ) const +inline void* CBlock::GetObject( sal_uInt16 nIndex ) const { return pNodes[nIndex]; } @@ -111,11 +111,11 @@ inline void* CBlock::GetObject( USHORT nIndex ) const |* *************************************************************************/ -inline void* Container::ImpGetObject( ULONG nIndex ) const +inline void* Container::ImpGetObject( sal_uIntPtr nIndex ) const { if ( pFirstBlock && (nIndex < pFirstBlock->Count()) ) // Item innerhalb des gefundenen Blocks zurueckgeben - return pFirstBlock->GetObject( (USHORT)nIndex ); + return pFirstBlock->GetObject( (sal_uInt16)nIndex ); else return GetObject( nIndex ); } |