diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-17 23:09:11 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-18 08:18:29 +0100 |
commit | 95401d5898412bc74892f0c5325fb614044d4bf1 (patch) | |
tree | 0c4b4d41e372282fb5063ecc295590b73cd3a22b /include | |
parent | cda903f83831341f44833b94e7d38e598f5a7198 (diff) |
tools: sal_Bool -> bool
Change-Id: I3aad235d92b3972b44199294c0f3de65ad57f450
Diffstat (limited to 'include')
-rw-r--r-- | include/tools/bigint.hxx | 40 | ||||
-rw-r--r-- | include/tools/ref.hxx | 4 | ||||
-rw-r--r-- | include/tools/rtti.hxx | 18 | ||||
-rw-r--r-- | include/tools/stream.hxx | 2 |
4 files changed, 32 insertions, 32 deletions
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx index f563803a2947..3b8a98261a45 100644 --- a/include/tools/bigint.hxx +++ b/include/tools/bigint.hxx @@ -41,7 +41,7 @@ private: long nVal; unsigned short nNum[MAX_DIGITS]; sal_uInt8 nLen : 5; // current length - sal_Bool bIsNeg : 1, // Is Sign negative? + bool bIsNeg : 1, // Is Sign negative? bIsBig : 1, // sal_True == BigInt bIsSet : 1; // Not "Null" (not "not 0") @@ -123,36 +123,36 @@ public: inline BigInt::BigInt() { - bIsSet = sal_False; - bIsBig = sal_False; + bIsSet = false; + bIsBig = false; nVal = 0; } inline BigInt::BigInt( short nValue ) { - bIsSet = sal_True; - bIsBig = sal_False; + bIsSet = true; + bIsBig = false; nVal = nValue; } inline BigInt::BigInt( long nValue ) { - bIsSet = sal_True; - bIsBig = sal_False; + bIsSet = true; + bIsBig = false; nVal = nValue; } inline BigInt::BigInt( int nValue ) { - bIsSet = sal_True; - bIsBig = sal_False; + bIsSet = true; + bIsBig = false; nVal = nValue; } inline BigInt::BigInt( sal_uInt16 nValue ) { - bIsSet = sal_True; - bIsBig = sal_False; + bIsSet = true; + bIsBig = false; nVal = nValue; } @@ -190,8 +190,8 @@ inline BigInt::operator sal_uInt16() const inline BigInt& BigInt::operator =( const short nValue ) { - bIsSet = sal_True; - bIsBig = sal_False; + bIsSet = true; + bIsBig = false; nVal = nValue; return *this; @@ -199,8 +199,8 @@ inline BigInt& BigInt::operator =( const short nValue ) inline BigInt& BigInt::operator =( const long nValue ) { - bIsSet = sal_True; - bIsBig = sal_False; + bIsSet = true; + bIsBig = false; nVal = nValue; return *this; @@ -208,8 +208,8 @@ inline BigInt& BigInt::operator =( const long nValue ) inline BigInt& BigInt::operator =( const int nValue ) { - bIsSet = sal_True; - bIsBig = sal_False; + bIsSet = true; + bIsBig = false; nVal = nValue; return *this; @@ -217,8 +217,8 @@ inline BigInt& BigInt::operator =( const int nValue ) inline BigInt& BigInt::operator =( const sal_uInt16 nValue ) { - bIsSet = sal_True; - bIsBig = sal_False; + bIsSet = true; + bIsBig = false; nVal = nValue; return *this; @@ -251,7 +251,7 @@ inline bool BigInt::IsOne() const inline void BigInt::Abs() { if ( bIsBig ) - bIsNeg = sal_False; + bIsNeg = false; else if ( nVal < 0 ) nVal = -nVal; } diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx index 254b1eb684f0..bdc055b9ee0a 100644 --- a/include/tools/ref.hxx +++ b/include/tools/ref.hxx @@ -61,7 +61,7 @@ public: \ inline ~ClassName##Ref(); \ inline ClassName##Ref & operator = ( const ClassName##Ref & rObj ); \ inline ClassName##Ref & operator = ( ClassName * pObj ); \ - inline sal_Bool Is() const { return pObj != NULL; } \ + inline bool Is() const { return pObj != NULL; } \ inline ClassName * operator & () const { return pObj; } \ inline ClassName * operator -> () const { return pObj; } \ inline ClassName & operator * () const { return *pObj; } \ @@ -234,7 +234,7 @@ public: \ inline void Clear() { _xHdl.Clear(); } \ inline ClassName##Weak& operator = ( ClassName * pObj ) { \ _xHdl = pObj ? pObj->GetHdl() : 0; return *this; } \ - inline sal_Bool Is() const { \ + inline bool Is() const { \ return _xHdl.Is() && _xHdl->GetObj(); } \ inline ClassName * operator & () const { \ return (ClassName*) ( _xHdl.Is() ? _xHdl->GetObj() : 0 ); } \ diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx index 81cabe5e89bb..3e2676baa7c8 100644 --- a/include/tools/rtti.hxx +++ b/include/tools/rtti.hxx @@ -28,36 +28,36 @@ typedef void* (*TypeId)(); #define TYPEINFO() \ static void* CreateType(); \ static TypeId StaticType(); \ - static sal_Bool IsOf( TypeId aSameOrSuperType ); \ + static bool IsOf( TypeId aSameOrSuperType ); \ virtual TypeId Type() const; \ - virtual sal_Bool IsA( TypeId aSameOrSuperType ) const + virtual bool IsA( TypeId aSameOrSuperType ) const #define TYPEINFO_VISIBILITY(visibility) \ visibility static void* CreateType(); \ visibility static TypeId StaticType(); \ - visibility static sal_Bool IsOf( TypeId aSameOrSuperType ); \ + visibility static bool IsOf( TypeId aSameOrSuperType ); \ visibility virtual TypeId Type() const; \ - visibility virtual sal_Bool IsA( TypeId aSameOrSuperType ) const + visibility virtual bool IsA( TypeId aSameOrSuperType ) const #define TYPEINIT_FACTORY(sType, Factory ) \ void* sType::CreateType() { return Factory; } \ TypeId sType::StaticType() { return &CreateType; } \ TypeId sType::Type() const { return &CreateType; } \ - sal_Bool sType::IsOf( TypeId aSameOrSuperType ) \ + bool sType::IsOf( TypeId aSameOrSuperType ) \ { \ if ( aSameOrSuperType == StaticType() ) \ - return sal_True + return true #define STATICTYPE(sType) (sType::StaticType()) #define SUPERTYPE(sSuper) \ if ( sSuper::IsOf(aSameOrSuperType ) ) \ - return sal_True + return true #define TYPEINIT_END(sType) \ - return sal_False; \ + return false; \ } \ - sal_Bool sType::IsA( TypeId aSameOrSuperType ) const \ + bool sType::IsA( TypeId aSameOrSuperType ) const \ { return IsOf( aSameOrSuperType ); } #define TYPEINIT0_FACTORY(sType, Factory) \ diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 546cf9930a95..16472b783977 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -326,7 +326,7 @@ public: SvStream& WriteStream( SvStream& rStream ); SvStream& WriteBool( bool b ) - { return WriteUChar(static_cast< sal_Bool >(b)); } + { return WriteUChar(static_cast<unsigned char>(b)); } SvStream& WriteSChar( signed char nChar ); SvStream& WriteChar( char nChar ); SvStream& WriteUChar( unsigned char nChar ); |