diff options
Diffstat (limited to 'idl/source/objects/bastype.cxx')
-rwxr-xr-x[-rw-r--r--] | idl/source/objects/bastype.cxx | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index ac046dfdaa8a..19df1c0967b2 100644..100755 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -40,34 +40,34 @@ #ifdef IDL_COMPILER /************************************************************************/ -static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, - ULONG nMin, ULONG nMax, ULONG* pValue ) +static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, + sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue ) { - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( pName ) ) { - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; if( rInStm.Read( '=' ) ) { pTok = rInStm.GetToken_Next(); if( pTok->IsInteger() ) { - ULONG n = pTok->GetNumber(); + sal_uLong n = pTok->GetNumber(); if ( n >= nMin && n <= nMax ) { *pValue = n; - bOk = TRUE; + bOk = sal_True; } } } if( bOk ) - return TRUE; + return sal_True; } rInStm.Seek( nTokPos ); - return FALSE; + return sal_False; } #endif @@ -81,12 +81,12 @@ static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -UINT32 SvUINT32::Read( SvStream & rStm ) +sal_uInt32 SvUINT32::Read( SvStream & rStm ) { return SvPersistStream::ReadCompressed( rStm ); } -void SvUINT32::Write( SvStream & rStm, UINT32 nVal ) +void SvUINT32::Write( SvStream & rStm, sal_uInt32 nVal ) { SvPersistStream::WriteCompressed( rStm, nVal ); } @@ -103,7 +103,7 @@ void SvUINT32::Write( SvStream & rStm, UINT32 nVal ) *************************************************************************/ SvStream& operator << (SvStream & rStm, const SvBOOL & rb ) { - BYTE n = rb.nVal; + sal_uInt8 n = rb.nVal; if( rb.bSet ) n |= 0x02; rStm << n; @@ -111,10 +111,10 @@ SvStream& operator << (SvStream & rStm, const SvBOOL & rb ) } SvStream& operator >> (SvStream & rStm, SvBOOL & rb ) { - BYTE n; + sal_uInt8 n; rStm >> n; - rb.nVal = (n & 0x01) ? TRUE : FALSE; - rb.bSet = (n & 0x02) ? TRUE : FALSE; + rb.nVal = (n & 0x01) ? sal_True : sal_False; + rb.bSet = (n & 0x02) ? sal_True : sal_False; if( n & ~0x03 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); @@ -143,11 +143,11 @@ SvStream& operator << (SvStream & rStm, const SvVersion & r ) int n = r.GetMajorVersion() << 4; n |= r.GetMinorVersion(); - rStm << (BYTE)n; + rStm << (sal_uInt8)n; } else { - rStm << (BYTE)0; + rStm << (sal_uInt8)0; rStm << r.GetMajorVersion(); rStm << r.GetMinorVersion(); } @@ -156,7 +156,7 @@ SvStream& operator << (SvStream & rStm, const SvVersion & r ) SvStream& operator >> (SvStream & rStm, SvVersion & r ) { - BYTE n; + sal_uInt8 n; rStm >> n; if( n == 0 ) { // nicht komprimiert @@ -184,15 +184,15 @@ SvStream& operator >> (SvStream & rStm, SvVersion & r ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) +sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) { - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( pName ) ) { - BOOL bOk = TRUE; - BOOL bBraket = rInStm.Read( '(' ); + sal_Bool bOk = sal_True; + sal_Bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { pTok = rInStm.GetToken(); @@ -206,12 +206,12 @@ BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) bOk = rInStm.Read( ')' ); } else - *this = TRUE; //Defaultaktion ist auf TRUE setzen + *this = sal_True; //Defaultaktion ist auf sal_True setzen if( bOk ) - return TRUE; + return sal_True; } rInStm.Seek( nTokPos ); - return FALSE; + return sal_False; } /************************************************************************* @@ -221,13 +221,13 @@ BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) |* Beschreibung |* *************************************************************************/ -BOOL SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm ) +sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm ) { if( nVal ) rOutStm << pName->GetName().GetBuffer(); else rOutStm << pName->GetName().GetBuffer() << "(FALSE)"; - return TRUE; + return sal_True; } /************************************************************************* @@ -258,15 +258,15 @@ ByteString SvBOOL::GetSvIdlString( SvStringHashEntry * pName ) |* Beschreibung |* *************************************************************************/ -BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) +sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) { - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( pName ) ) { - BOOL bOk = TRUE; - BOOL bBraket = rInStm.Read( '(' ); + sal_Bool bOk = sal_True; + sal_Bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { pTok = rInStm.GetToken(); @@ -279,10 +279,10 @@ BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm bOk = rInStm.Read( ')' ); } if( bOk ) - return TRUE; + return sal_True; } rInStm.Seek( nTokPos ); - return FALSE; + return sal_False; } /************************************************************************* @@ -292,13 +292,13 @@ BOOL SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm |* Beschreibung |* *************************************************************************/ -BOOL SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, +sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, - USHORT /*nTab */ ) + sal_uInt16 /*nTab */ ) { rOutStm << pName->GetName().GetBuffer() << '('; rOutStm << GetBuffer() << ')'; - return TRUE; + return sal_True; } SvStream& operator << (SvStream & rStm, const SvIdentifier & r ) @@ -322,17 +322,17 @@ SvStream& operator >> (SvStream & rStm, SvIdentifier & r ) |* Beschreibung |* *************************************************************************/ -BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, +sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, SvStringHashEntry * pName, SvTokenStream & rInStm ) { if( SvIdentifier::ReadSvIdl( pName, rInStm ) ) { - ULONG n; + sal_uLong n; if( rBase.FindId( *this, &n ) ) { nValue = n; - return TRUE; + return sal_True; } else { @@ -343,7 +343,7 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, rBase.WriteError( rInStm ); } } - return FALSE; + return sal_False; } /************************************************************************* @@ -353,20 +353,20 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, |* Beschreibung |* *************************************************************************/ -BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, +sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->IsIdentifier() ) { - ULONG n; + sal_uLong n; if( rBase.FindId( pTok->GetString(), &n ) ) { *(ByteString *)this = pTok->GetString(); nValue = n; - return TRUE; + return sal_True; } else { @@ -378,7 +378,7 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, } } rInStm.Seek( nTokPos ); - return FALSE; + return sal_False; } /************************************************************************* @@ -416,15 +416,15 @@ SvStream& operator >> (SvStream & rStm, SvNumberIdentifier & r ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) +sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) { - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( pName ) ) { - BOOL bOk = TRUE; - BOOL bBraket = rInStm.Read( '(' ); + sal_Bool bOk = sal_True; + sal_Bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { pTok = rInStm.GetToken(); @@ -437,10 +437,10 @@ BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) bOk = rInStm.Read( ')' ); } if( bOk ) - return TRUE; + return sal_True; } rInStm.Seek( nTokPos ); - return FALSE; + return sal_False; } /************************************************************************* @@ -452,12 +452,12 @@ BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, - USHORT /*nTab */ ) +sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, + sal_uInt16 /*nTab */ ) { rOutStm << pName->GetName().GetBuffer() << "(\""; rOutStm << GetBuffer() << "\")"; - return TRUE; + return sal_True; } SvStream& operator << (SvStream & rStm, const SvString & r ) @@ -482,7 +482,7 @@ SvStream& operator >> (SvStream & rStm, SvString & r ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) +sal_Bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) { return SvString::ReadSvIdl( SvHash_HelpText(), rInStm ); } @@ -496,7 +496,7 @@ BOOL SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT nTab ) +sal_Bool SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab ) { return SvString::WriteSvIdl( SvHash_HelpText(), rOutStm, nTab ); } @@ -511,15 +511,15 @@ BOOL SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT nTab ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) +sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) { - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( SvHash_uuid() ) ) { - BOOL bOk = TRUE; - BOOL bBraket = rInStm.Read( '(' ); + sal_Bool bOk = sal_True; + sal_Bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { pTok = rInStm.GetToken(); @@ -532,10 +532,10 @@ BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) bOk = rInStm.Read( ')' ); } if( bOk ) - return TRUE; + return sal_True; } rInStm.Seek( nTokPos ); - return FALSE; + return sal_False; } /************************************************************************* @@ -547,12 +547,12 @@ BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvUUId::WriteSvIdl( SvStream & rOutStm ) +sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm ) { // Global Id schreiben rOutStm << SvHash_uuid()->GetName().GetBuffer() << "(\""; rOutStm << ByteString( GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << "\")"; - return TRUE; + return sal_True; } @@ -566,28 +566,28 @@ BOOL SvUUId::WriteSvIdl( SvStream & rOutStm ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm ) +sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm ) { - ULONG n = 0; + sal_uLong n = 0; - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) ) { - nMajorVersion = (USHORT)n; + nMajorVersion = (sal_uInt16)n; if( rInStm.Read( '.' ) ) { SvToken * pTok = rInStm.GetToken_Next(); if( pTok->IsInteger() && pTok->GetNumber() <= 0xFFFF ) { - nMinorVersion = (USHORT)pTok->GetNumber(); - return TRUE; + nMinorVersion = (sal_uInt16)pTok->GetNumber(); + return sal_True; } } else - return TRUE; + return sal_True; } rInStm.Seek( nTokPos ); - return FALSE; + return sal_False; } /************************************************************************* @@ -599,12 +599,12 @@ BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvVersion::WriteSvIdl( SvStream & rOutStm ) +sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm ) { rOutStm << SvHash_Version()->GetName().GetBuffer() << '(' << ByteString::CreateFromInt32( nMajorVersion ).GetBuffer() << '.' << ByteString::CreateFromInt32( nMinorVersion ).GetBuffer() << ')'; - return TRUE; + return sal_True; } #endif //IDL_COMPILER |