diff options
Diffstat (limited to 'idl/source/cmptools')
-rw-r--r-- | idl/source/cmptools/hash.cxx | 24 | ||||
-rw-r--r-- | idl/source/cmptools/lex.cxx | 18 |
2 files changed, 21 insertions, 21 deletions
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx index de253b6b817d..4e41c8932e4a 100644 --- a/idl/source/cmptools/hash.cxx +++ b/idl/source/cmptools/hash.cxx @@ -41,7 +41,7 @@ SvHashTable::~SvHashTable() { } -sal_Bool SvHashTable::Test_Insert( const OString& rElement, sal_Bool bInsert, +bool SvHashTable::Test_Insert( const OString& rElement, bool bInsert, sal_uInt32 * pInsertPos ) { sal_uInt32 nHash; @@ -61,7 +61,7 @@ sal_Bool SvHashTable::Test_Insert( const OString& rElement, sal_Bool bInsert, { if( pInsertPos ) *pInsertPos = nIndex; // place of Element - return sal_True; + return true; } nLoop++; lTry++; @@ -75,10 +75,10 @@ sal_Bool SvHashTable::Test_Insert( const OString& rElement, sal_Bool bInsert, { nFill++; *pInsertPos = nIndex; // return free place - return sal_True; + return true; } } - return( sal_False ); + return false; } SvStringHashTable::SvStringHashTable( sal_uInt32 nMaxEntries ) @@ -149,30 +149,30 @@ OString SvStringHashTable::GetNearString( const OString& rName ) const return OString(); } -sal_Bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const +bool SvStringHashTable::IsEntry( sal_uInt32 nIndex ) const { if( nIndex >= GetMax() ) - return sal_False; + return false; return pEntries[ nIndex ].HasId(); } -sal_Bool SvStringHashTable::Insert( const OString& rName, sal_uInt32 * pIndex ) +bool SvStringHashTable::Insert( const OString& rName, sal_uInt32 * pIndex ) { sal_uInt32 nIndex; if( !pIndex ) pIndex = &nIndex; - if( !SvHashTable::Test_Insert( rName, sal_True, pIndex ) ) - return sal_False; + if( !SvHashTable::Test_Insert( rName, true, pIndex ) ) + return false; if( !IsEntry( *pIndex ) ) pEntries[ *pIndex ] = SvStringHashEntry( rName, *pIndex ); - return sal_True; + return true; } -sal_Bool SvStringHashTable::Test( const OString& rName, sal_uInt32 * pPos ) const +bool SvStringHashTable::Test( const OString& rName, sal_uInt32 * pPos ) const { - return const_cast<SvStringHashTable*>(this)->Test_Insert( rName, sal_False, pPos ); + return const_cast<SvStringHashTable*>(this)->Test_Insert( rName, false, pPos ); } SvStringHashEntry * SvStringHashTable::Get( sal_uInt32 nIndex ) const diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index 23793a661882..e5fa39cb65dd 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -210,7 +210,7 @@ sal_uLong SvTokenStream::GetNumber() return( l ); } -sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) +bool SvTokenStream::MakeToken( SvToken & rToken ) { do { @@ -253,7 +253,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) { c = GetNextChar(); if( IsEof() ) - return sal_False; + return false; } else c = GetFastNextChar(); @@ -262,7 +262,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) } while( '/' != c && !IsEof() && ( SVSTREAM_OK == rInStream.GetError() ) ); if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) ) - return sal_False; + return false; c = GetNextChar(); rToken.nType = SVTOKEN_COMMENT; CalcColumn(); @@ -276,7 +276,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) else if( c == '"' ) { OStringBuffer aStr; - sal_Bool bDone = sal_False; + bool bDone = false; while( !bDone && !IsEof() && c ) { c = GetFastNextChar(); @@ -286,7 +286,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) aStr.append('\n'); c = GetNextChar(); if( IsEof() ) - return sal_False; + return false; } if( c == '"' ) { @@ -297,7 +297,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) aStr.append('"'); } else - bDone = sal_True; + bDone = true; } else if( c == '\\' ) { @@ -310,7 +310,7 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) aStr.append(static_cast<char>(c)); } if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) ) - return sal_False; + return false; rToken.nType = SVTOKEN_STRING; rToken.aString = aStr.makeStringAndClear(); } @@ -332,12 +332,12 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) if( aStr.equalsIgnoreAsciiCase( aStrTrue ) ) { rToken.nType = SVTOKEN_BOOL; - rToken.bBool = sal_True; + rToken.bBool = true; } else if( aStr.equalsIgnoreAsciiCase( aStrFalse ) ) { rToken.nType = SVTOKEN_BOOL; - rToken.bBool = sal_False; + rToken.bBool = false; } else { |