diff options
Diffstat (limited to 'tools/inc/tools/globname.hxx')
| -rwxr-xr-x[-rw-r--r--] | tools/inc/tools/globname.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx index cbca2169b518..552b702c4084 100644..100755 --- a/tools/inc/tools/globname.hxx +++ b/tools/inc/tools/globname.hxx @@ -38,8 +38,8 @@ *************************************************************************/ struct ImpSvGlobalName { - BYTE szData[ 16 ]; - USHORT nRefCount; + sal_uInt8 szData[ 16 ]; + sal_uInt16 nRefCount; ImpSvGlobalName() { @@ -48,7 +48,7 @@ struct ImpSvGlobalName ImpSvGlobalName( const ImpSvGlobalName & rObj ); ImpSvGlobalName( int ); - BOOL operator == ( const ImpSvGlobalName & rObj ) const; + sal_Bool operator == ( const ImpSvGlobalName & rObj ) const; }; #ifdef WNT @@ -77,9 +77,9 @@ public: pImp = pImpP; pImp->nRefCount++; } - SvGlobalName( UINT32 n1, USHORT n2, USHORT n3, - BYTE b8, BYTE b9, BYTE b10, BYTE b11, - BYTE b12, BYTE b13, BYTE b14, BYTE b15 ); + SvGlobalName( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3, + sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11, + sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 ); // create SvGlobalName from a platform independent representation SvGlobalName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aSeq ); @@ -90,16 +90,16 @@ public: TOOLS_DLLPUBLIC friend SvStream & operator >> ( SvStream &, SvGlobalName & ); TOOLS_DLLPUBLIC friend SvStream & operator << ( SvStream &, const SvGlobalName & ); - BOOL operator < ( const SvGlobalName & rObj ) const; - SvGlobalName & operator += ( UINT32 ); + sal_Bool operator < ( const SvGlobalName & rObj ) const; + SvGlobalName & operator += ( sal_uInt32 ); SvGlobalName & operator ++ () { return operator += ( 1 ); } - BOOL operator == ( const SvGlobalName & rObj ) const; - BOOL operator != ( const SvGlobalName & rObj ) const + sal_Bool operator == ( const SvGlobalName & rObj ) const; + sal_Bool operator != ( const SvGlobalName & rObj ) const { return !(*this == rObj); } void MakeFromMemory( void * pData ); - BOOL MakeId( const String & rId ); + sal_Bool MakeId( const String & rId ); String GetctorName() const; String GetHexName() const; String GetRegDbName() const @@ -112,7 +112,7 @@ public: SvGlobalName( const CLSID & rId ); const CLSID & GetCLSID() const { return *(CLSID *)pImp->szData; } - const BYTE* GetBytes() const { return pImp->szData; } + const sal_uInt8* GetBytes() const { return pImp->szData; } // platform independent representation of a "GlobalName" // maybe transported remotely @@ -127,9 +127,9 @@ public: ~SvGlobalNameList(); void Append( const SvGlobalName & ); - SvGlobalName GetObject( ULONG ); - BOOL IsEntry( const SvGlobalName & rName ); - ULONG Count() const { return aList.size(); } + SvGlobalName GetObject( sal_uLong ); + sal_Bool IsEntry( const SvGlobalName & rName ); + size_t Count() const { return aList.size(); } private: // nicht erlaubt SvGlobalNameList( const SvGlobalNameList & ); |