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 | |
parent | cda903f83831341f44833b94e7d38e598f5a7198 (diff) |
tools: sal_Bool -> bool
Change-Id: I3aad235d92b3972b44199294c0f3de65ad57f450
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 6 | ||||
-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 | ||||
-rw-r--r-- | sfx2/source/appl/lnkbase2.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/swbaslnk.cxx | 2 | ||||
-rw-r--r-- | tools/source/generic/bigint.cxx | 66 |
8 files changed, 70 insertions, 70 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 6d173978f386..3c884cd13e8f 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -811,9 +811,9 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi if ( pRet ) { sal_Bool bDeleteSource = aTextObj.GetOEPlaceHolderAtom() != 0; - if ( bDeleteSource && ( pRet->ISA( SdrGrafObj ) == sal_False ) // we are not allowed to get - && ( pRet->ISA( SdrObjGroup ) == sal_False ) // grouped placeholder objects - && ( pRet->ISA( SdrOle2Obj ) == sal_False ) ) + if ( bDeleteSource && !pRet->ISA( SdrGrafObj ) // we are not allowed to get + && !pRet->ISA( SdrObjGroup ) // grouped placeholder objects + && !pRet->ISA( SdrOle2Obj ) ) SdrObject::Free( pRet ); } sal_uInt32 nTextFlags = aTextObj.GetTextFlags(); 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 ); diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 3163debb7dff..e203472cc265 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -443,7 +443,7 @@ void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl ) { pImpl->m_pParentWin = pParent; pImpl->m_aEndEditLink = rEndEditHdl; - pImpl->m_bIsConnect = ( xObj.Is() != sal_False ); + pImpl->m_bIsConnect = xObj.Is(); if( !pImpl->m_bIsConnect ) _GetRealObject( xObj.Is() ); diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index b2cf46b6ff3d..0bc76367ab12 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -72,7 +72,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem ) if( pLast ) // Were we able to jump to the beginning? { do { - if( (0 == n) != ( 0 != pLast->ISA( SwCntntFrm )) ) + if( (0 == n) != pLast->ISA( SwCntntFrm ) ) pLast->ModifyNotification( &rItem, &rItem ); } while( 0 != ( pLast = ++aIter )); } diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index 0c95ae6a29e5..6576cfb9a7dc 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -53,14 +53,14 @@ void BigInt::MakeBigInt( const BigInt& rVal ) long nTmp = rVal.nVal; nVal = rVal.nVal; - bIsBig = sal_True; + bIsBig = true; if ( nTmp < 0 ) { - bIsNeg = sal_True; + bIsNeg = true; nTmp = -nTmp; } else - bIsNeg = sal_False; + bIsNeg = false; nNum[0] = (sal_uInt16)(nTmp & 0xffffL); nNum[1] = (sal_uInt16)(nTmp >> 16); @@ -87,7 +87,7 @@ void BigInt::Normalize() else nVal = ((long)nNum[1] << 16) + nNum[0]; - bIsBig = sal_False; + bIsBig = false; if ( bIsNeg ) nVal = -nVal; @@ -119,7 +119,7 @@ void BigInt::Mult( const BigInt &rVal, sal_uInt16 nMul ) else nLen = rVal.nLen; - bIsBig = sal_True; + bIsBig = true; bIsNeg = rVal.bIsNeg; } @@ -194,20 +194,20 @@ void BigInt::AddLong( BigInt& rB, BigInt& rErg ) // Set length and sign rErg.nLen = len; rErg.bIsNeg = bIsNeg && rB.bIsNeg; - rErg.bIsBig = sal_True; + rErg.bIsBig = true; } // If one of the values is negative, perform substraction instead else if (bIsNeg) { - bIsNeg = sal_False; + bIsNeg = false; rB.SubLong(*this, rErg); - bIsNeg = sal_True; + bIsNeg = true; } else { - rB.bIsNeg = sal_False; + rB.bIsNeg = false; SubLong(rB, rErg); - rB.bIsNeg = sal_True; + rB.bIsNeg = true; } } @@ -262,22 +262,22 @@ void BigInt::SubLong( BigInt& rB, BigInt& rErg ) rErg.bIsNeg = !bIsNeg; } rErg.nLen = len; - rErg.bIsBig = sal_True; + rErg.bIsBig = true; } // If one of the values is negative, perform addition instead else if (bIsNeg) { - bIsNeg = sal_False; + bIsNeg = false; AddLong(rB, rErg); - bIsNeg = sal_True; - rErg.bIsNeg = sal_True; + bIsNeg = true; + rErg.bIsNeg = true; } else { - rB.bIsNeg = sal_False; + rB.bIsNeg = false; AddLong(rB, rErg); - rB.bIsNeg = sal_True; - rErg.bIsNeg = sal_False; + rB.bIsNeg = true; + rErg.bIsNeg = false; } } @@ -287,7 +287,7 @@ void BigInt::MultLong( const BigInt& rB, BigInt& rErg ) const sal_uInt32 nZ, k; rErg.bIsNeg = bIsNeg != rB.bIsNeg; - rErg.bIsBig = sal_True; + rErg.bIsBig = true; rErg.nLen = nLen + rB.nLen; for (i = 0; i < rErg.nLen; i++) @@ -371,7 +371,7 @@ void BigInt::DivLong( const BigInt& rB, BigInt& rErg ) const } rErg.bIsNeg = bIsNeg != rB.bIsNeg; - rErg.bIsBig = sal_True; + rErg.bIsBig = true; rErg.nLen = nLen - rB.nLen + 1; } @@ -479,16 +479,16 @@ BigInt::BigInt( const BigInt& rBigInt ) else { bIsSet = rBigInt.bIsSet; - bIsBig = sal_False; + bIsBig = false; nVal = rBigInt.nVal; } } BigInt::BigInt( const OUString& rString ) { - bIsSet = sal_True; - bIsNeg = sal_False; - bIsBig = sal_False; + bIsSet = true; + bIsNeg = false; + bIsBig = false; nVal = 0; bool bNeg = false; @@ -512,26 +512,26 @@ BigInt::BigInt( const OUString& rString ) BigInt::BigInt( double nValue ) { - bIsSet = sal_True; + bIsSet = true; if ( nValue < 0 ) { nValue *= -1; - bIsNeg = sal_True; + bIsNeg = true; } else { - bIsNeg = sal_False; + bIsNeg = false; } if ( nValue < 1 ) { - bIsBig = sal_False; + bIsBig = false; nVal = 0; } else { - bIsBig = sal_True; + bIsBig = true; int i=0; @@ -554,18 +554,18 @@ BigInt::BigInt( double nValue ) BigInt::BigInt( sal_uInt32 nValue ) { - bIsSet = sal_True; + bIsSet = true; if ( nValue & 0x80000000UL ) { - bIsBig = sal_True; - bIsNeg = sal_False; + bIsBig = true; + bIsNeg = false; nNum[0] = (sal_uInt16)(nValue & 0xffffUL); nNum[1] = (sal_uInt16)(nValue >> 16); nLen = 2; } else { - bIsBig = sal_False; + bIsBig = false; nVal = nValue; } } @@ -657,7 +657,7 @@ BigInt& BigInt::operator=( const BigInt& rBigInt ) else { bIsSet = rBigInt.bIsSet; - bIsBig = sal_False; + bIsBig = false; nVal = rBigInt.nVal; } return *this; |