diff options
Diffstat (limited to 'idl/source/objects')
-rw-r--r-- | idl/source/objects/basobj.cxx | 46 | ||||
-rw-r--r-- | idl/source/objects/bastype.cxx | 96 | ||||
-rw-r--r-- | idl/source/objects/module.cxx | 30 | ||||
-rw-r--r-- | idl/source/objects/object.cxx | 20 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 136 | ||||
-rw-r--r-- | idl/source/objects/types.cxx | 160 |
6 files changed, 244 insertions, 244 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 08b812970535..666d1cbdf106 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -55,18 +55,18 @@ void SvMetaObject::WriteStars( SvStream & rOutStm ) rOutStm.WriteChar( '/' ) << endl; } -sal_Bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos ) +bool SvMetaObject::TestAndSeekSpaceOnly( SvStream & rOutStm, sal_uLong nBegPos ) { // write no empty brackets sal_uLong nPos = rOutStm.Tell(); rOutStm.Seek( nBegPos ); - sal_Bool bOnlySpace = sal_True; + bool bOnlySpace = true; while( bOnlySpace && rOutStm.Tell() < nPos ) { char c; rOutStm.ReadChar( c ); if( !isspace( c ) ) - bOnlySpace = sal_False; + bOnlySpace = false; } if( bOnlySpace ) // nothing written @@ -96,9 +96,9 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm ) rOutStm.Seek( nPos ); } -sal_Bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & ) +bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & ) { - return sal_False; + return false; } void SvMetaObject::WriteSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ ) @@ -152,13 +152,13 @@ void SvMetaName::Save( SvPersistStream & rStm ) if( nMask & 0x10 ) WriteSvString( rStm, aDescription ); } -sal_Bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * ) +bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * ) { aName.setString(rName); - return sal_True; + return true; } -sal_Bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase, +bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); @@ -167,10 +167,10 @@ sal_Bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase, // read module name if( pTok->IsIdentifier() ) if( SetName( pTok->GetString(), &rBase ) ) - return sal_True; + return true; rInStm.Seek( nTokPos ); - return sal_False; + return false; } void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase, @@ -208,9 +208,9 @@ void SvMetaName::ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & ) { } -sal_Bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & ) +bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & ) { - return sal_True; + return true; } void SvMetaName::WriteContextSvIdl( SvIdlDataBase &, SvStream &, sal_uInt16 ) @@ -263,10 +263,10 @@ void SvMetaName::WriteAttributesSvIdl( SvIdlDataBase & rBase, } } -sal_Bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) +bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); - sal_Bool bOk = sal_True; + bool bOk = true; if( rInStm.Read( '[' ) ) { sal_uInt32 nBeginPos = 0; // can not happen with Tell @@ -343,13 +343,13 @@ void SvMetaName::Write( SvIdlDataBase & rBase, SvStream & rOutStm, // write no empty brackets sal_uLong nPos = rOutStm.Tell(); rOutStm.Seek( nOldPos ); - sal_Bool bOnlySpace = sal_True; + bool bOnlySpace = true; while( bOnlySpace && rOutStm.Tell() < nPos ) { char c; rOutStm.ReadChar( c ); if( !isspace( c ) ) - bOnlySpace = sal_False; + bOnlySpace = false; } if( bOnlySpace ) // nothing written @@ -435,8 +435,8 @@ SV_IMPL_META_FACTORY1( SvMetaExtern, SvMetaReference ); SvMetaExtern::SvMetaExtern() : pModule( NULL ) - , bReadUUId( sal_False ) - , bReadVersion( sal_False ) + , bReadUUId( false ) + , bReadVersion( false ) { } @@ -455,8 +455,8 @@ void SvMetaExtern::Load( SvPersistStream & rStm ) if( nMask & 0x01 ) rStm >> pModule; if( nMask & 0x02 ) rStm >> aUUId; if( nMask & 0x04 ) rStm >> aVersion; - if( nMask & 0x08 ) bReadUUId = sal_True; - if( nMask & 0x10 ) bReadVersion = sal_True; + if( nMask & 0x08 ) bReadUUId = true; + if( nMask & 0x10 ) bReadVersion = true; } void SvMetaExtern::Save( SvPersistStream & rStm ) @@ -501,9 +501,9 @@ void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase, { SvMetaReference::ReadAttributesSvIdl( rBase, rInStm ); if( aUUId.ReadSvIdl( rBase, rInStm ) ) - bReadUUId = sal_True; + bReadUUId = true; if( aVersion.ReadSvIdl( rInStm ) ) - bReadVersion = sal_True; + bReadVersion = true; } void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase, @@ -530,7 +530,7 @@ void SvMetaExtern::WriteAttributesSvIdl( SvIdlDataBase & rBase, } } -sal_Bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) +bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { SetModule( rBase ); GetUUId(); // id gets created diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index 5c1bb40b9652..b24f79544d32 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -26,14 +26,14 @@ #include <hash.hxx> #include <database.hxx> -static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, +static bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( pName ) ) { - sal_Bool bOk = sal_False; + bool bOk = false; if( rInStm.Read( '=' ) ) { pTok = rInStm.GetToken_Next(); @@ -43,17 +43,17 @@ static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInSt if ( n >= nMin && n <= nMax ) { *pValue = n; - bOk = sal_True; + bOk = true; } } } if( bOk ) - return sal_True; + return true; } rInStm.Seek( nTokPos ); - return sal_False; + return false; } sal_uInt32 SvUINT32::Read( SvStream & rStm ) @@ -127,15 +127,15 @@ SvStream& operator >> (SvStream & rStm, SvVersion & r ) } -sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) +bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( pName ) ) { - sal_Bool bOk = sal_True; - sal_Bool bBraket = rInStm.Read( '(' ); + bool bOk = true; + bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { pTok = rInStm.GetToken(); @@ -149,21 +149,21 @@ sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) bOk = rInStm.Read( ')' ); } else - *this = sal_True; //default action set to TRUE + *this = true; //default action set to TRUE if( bOk ) - return sal_True; + return true; } rInStm.Seek( nTokPos ); - return sal_False; + return false; } -sal_Bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm ) +bool SvBOOL::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm ) { if( nVal ) rOutStm.WriteCharPtr( pName->GetName().getStr() ); else rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteCharPtr( "(FALSE)" ); - return sal_True; + return true; } OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName ) @@ -176,15 +176,15 @@ OString SvBOOL::GetSvIdlString( SvStringHashEntry * pName ) makeStringAndClear(); } -sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) +bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( pName ) ) { - sal_Bool bOk = sal_True; - sal_Bool bBraket = rInStm.Read( '(' ); + bool bOk = true; + bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { pTok = rInStm.GetToken(); @@ -197,19 +197,19 @@ sal_Bool SvIdentifier::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rIn bOk = rInStm.Read( ')' ); } if( bOk ) - return sal_True; + return true; } rInStm.Seek( nTokPos ); - return sal_False; + return false; } -sal_Bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, +bool SvIdentifier::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, sal_uInt16 /*nTab */ ) { rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteChar( '(' ); rOutStm.WriteCharPtr( getString().getStr() ).WriteChar( ')' ); - return sal_True; + return true; } SvStream& WriteSvIdentifier(SvStream & rStm, const SvIdentifier & r ) @@ -225,7 +225,7 @@ SvStream& operator >> (SvStream & rStm, SvIdentifier & r ) } -sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, +bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, SvStringHashEntry * pName, SvTokenStream & rInStm ) { @@ -235,7 +235,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, if( rBase.FindId( getString(), &n ) ) { nValue = n; - return sal_True; + return true; } else { @@ -245,10 +245,10 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, rBase.WriteError( rInStm ); } } - return sal_False; + return false; } -sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, +bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); @@ -261,7 +261,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, { setString(pTok->GetString()); nValue = n; - return sal_True; + return true; } else { @@ -272,7 +272,7 @@ sal_Bool SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase, } } rInStm.Seek( nTokPos ); - return sal_False; + return false; } SvStream& WriteSvNumberIdentifier(SvStream & rStm, const SvNumberIdentifier & r ) @@ -290,15 +290,15 @@ SvStream& operator >> (SvStream & rStm, SvNumberIdentifier & r ) } -sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) +bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( pName ) ) { - sal_Bool bOk = sal_True; - sal_Bool bBraket = rInStm.Read( '(' ); + bool bOk = true; + bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { pTok = rInStm.GetToken(); @@ -311,18 +311,18 @@ sal_Bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm bOk = rInStm.Read( ')' ); } if( bOk ) - return sal_True; + return true; } rInStm.Seek( nTokPos ); - return sal_False; + return false; } -sal_Bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, +bool SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, sal_uInt16 /*nTab */ ) { rOutStm.WriteCharPtr( pName->GetName().getStr() ).WriteCharPtr( "(\"" ); rOutStm.WriteCharPtr( m_aStr.getStr() ).WriteCharPtr( "\")" ); - return sal_True; + return true; } SvStream& WriteSvString(SvStream & rStm, const SvString & r ) @@ -338,25 +338,25 @@ SvStream& operator >> (SvStream & rStm, SvString & r ) } -sal_Bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) +bool SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) { return SvString::ReadSvIdl( SvHash_HelpText(), rInStm ); } -sal_Bool SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab ) +bool SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab ) { return SvString::WriteSvIdl( SvHash_HelpText(), rOutStm, nTab ); } -sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) +bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( SvHash_uuid() ) ) { - sal_Bool bOk = sal_True; - sal_Bool bBraket = rInStm.Read( '(' ); + bool bOk = true; + bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { pTok = rInStm.GetToken(); @@ -369,22 +369,22 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) bOk = rInStm.Read( ')' ); } if( bOk ) - return sal_True; + return true; } rInStm.Seek( nTokPos ); - return sal_False; + return false; } -sal_Bool SvUUId::WriteSvIdl( SvStream & rOutStm ) +bool SvUUId::WriteSvIdl( SvStream & rOutStm ) { // write global id rOutStm.WriteCharPtr( SvHash_uuid()->GetName().getStr() ).WriteCharPtr( "(\"" ); rOutStm.WriteCharPtr( OUStringToOString(GetHexName(), RTL_TEXTENCODING_UTF8).getStr() ).WriteCharPtr( "\")" ); - return sal_True; + return true; } -sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm ) +bool SvVersion::ReadSvIdl( SvTokenStream & rInStm ) { sal_uLong n = 0; @@ -398,24 +398,24 @@ sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm ) if( pTok->IsInteger() && pTok->GetNumber() <= 0xFFFF ) { nMinorVersion = (sal_uInt16)pTok->GetNumber(); - return sal_True; + return true; } } else - return sal_True; + return true; } rInStm.Seek( nTokPos ); - return sal_False; + return false; } -sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm ) +bool SvVersion::WriteSvIdl( SvStream & rOutStm ) { rOutStm.WriteCharPtr( SvHash_Version()->GetName().getStr() ).WriteChar( '(' ) .WriteCharPtr( OString::number(nMajorVersion).getStr() ) .WriteChar( '.' ) .WriteCharPtr( OString::number(nMinorVersion).getStr() ) .WriteChar( ')' ); - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 2d3b9c5c7075..78ca274c3904 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -30,21 +30,21 @@ SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern ); SvMetaModule::SvMetaModule() - : bImported( sal_False ) - , bIsModified( sal_False ) + : bImported( false ) + , bIsModified( false ) { } -SvMetaModule::SvMetaModule( const OUString & rIdlFileName, sal_Bool bImp ) +SvMetaModule::SvMetaModule( const OUString & rIdlFileName, bool bImp ) : aIdlFileName( rIdlFileName ) - , bImported( bImp ), bIsModified( sal_False ) + , bImported( bImp ), bIsModified( false ) { } #define MODULE_VER 0x0001 void SvMetaModule::Load( SvPersistStream & rStm ) { - bImported = sal_True; // import always + bImported = true; // import always SvMetaExtern::Load( rStm ); sal_uInt16 nVer; @@ -100,27 +100,27 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm.Seek( nPos ); } -sal_Bool SvMetaModule::SetName( const OString& rName, SvIdlDataBase * pBase ) +bool SvMetaModule::SetName( const OString& rName, SvIdlDataBase * pBase ) { if( pBase ) { if( pBase->GetModule( rName ) ) - return sal_False; + return false; } return SvMetaExtern::SetName( rName ); } -sal_Bool SvMetaModule::FillNextName( SvGlobalName * pName ) +bool SvMetaModule::FillNextName( SvGlobalName * pName ) { *pName = aNextName; if( aNextName < aEndName ) { ++aNextName; - bIsModified = sal_True; - return sal_True; + bIsModified = true; + return true; } - return sal_False; + return false; } void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, @@ -217,7 +217,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, } else if( rInStm.GetToken()->Is( SvHash_include() ) ) { - sal_Bool bOk = sal_False; + bool bOk = false; rInStm.GetToken_Next(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) @@ -313,13 +313,13 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase, } } -sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) +bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { - bIsModified = sal_True; // up to now always when compiler running + bIsModified = true; // up to now always when compiler running sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); - sal_Bool bOk = pTok->Is( SvHash_module() ); + bool bOk = pTok->Is( SvHash_module() ); if( bOk ) { pTok = rInStm.GetToken_Next(); diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index d549d8fecbd9..81716c2fa1ac 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -70,7 +70,7 @@ void SvClassElement::Save( SvPersistStream & rStm ) SV_IMPL_META_FACTORY1( SvMetaClass, SvMetaType ); SvMetaClass::SvMetaClass() - : aAutomation( sal_True, sal_False ) + : aAutomation( true, false ) { } @@ -179,7 +179,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase, rBase.WriteError( rInStm ); } xAutomationInterface = pClass; - xEle->SetAutomation( sal_True ); + xEle->SetAutomation( true ); } else { @@ -216,7 +216,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase, rInStm.Seek( nTokPos ); SvMetaType * pType = rBase.ReadKnownType( rInStm ); - sal_Bool bOk = sal_False; + bool bOk = false; SvMetaAttributeRef xAttr; if( !pType || pType->IsItem() ) { @@ -277,12 +277,12 @@ void SvMetaClass::WriteContextSvIdl } } -sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) +bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uLong nTokPos = rInStm.Tell(); if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_CLASS ) { - sal_Bool bOk = sal_True; + bool bOk = true; if( rInStm.Read( ':' ) ) { aSuperClass = rBase.ReadKnownClass( rInStm ); @@ -304,10 +304,10 @@ sal_Bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) return bOk; } rInStm.Seek( nTokPos ); - return sal_False; + return false; } -sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm, +bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm, SvMetaAttribute & rAttr ) const { if ( !rAttr.GetRef() && rAttr.IsA( TYPE( SvMetaSlot ) ) ) @@ -334,7 +334,7 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS aStr.append(" with different id's"); rBase.SetError(aStr.makeStringAndClear(), rInStm.GetToken()); rBase.WriteError( rInStm ); - return sal_False; + return false; } } else @@ -355,14 +355,14 @@ sal_Bool SvMetaClass::TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInS aStr.append(" with equal id's"); rBase.SetError(aStr.makeStringAndClear(), rInStm.GetToken()); rBase.WriteError( rInStm ); - return sal_False; + return false; } } } SvMetaClass * pSC = aSuperClass; if( pSC ) return pSC->TestAttribute( rBase, rInStm, rAttr ); - return sal_True; + return true; } void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 21ae92287924..538d0af4dce6 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -34,10 +34,10 @@ SvMetaObject *SvMetaSlot::MakeClone() const } SvMetaSlot::SvMetaSlot() - : aCachable( sal_True, sal_False ) - , aSynchron( sal_True, sal_False ) - , aRecordPerSet( sal_True, sal_False ) - , aRecordAbsolute( sal_False, sal_False ) + : aCachable( true, false ) + , aSynchron( true, false ) + , aRecordPerSet( true, false ) + , aRecordAbsolute( false, false ) , pLinkedSlot(0) , pNextSlot(0) , nListPos(0) @@ -47,10 +47,10 @@ SvMetaSlot::SvMetaSlot() SvMetaSlot::SvMetaSlot( SvMetaType * pType ) : SvMetaAttribute( pType ) - , aCachable( sal_True, sal_False ) - , aSynchron( sal_True, sal_False ) - , aRecordPerSet( sal_True, sal_False ) - , aRecordAbsolute( sal_False, sal_False ) + , aCachable( true, false ) + , aSynchron( true, false ) + , aRecordPerSet( true, false ) + , aRecordAbsolute( false, false ) , pLinkedSlot(0) , pNextSlot(0) , nListPos(0) @@ -281,19 +281,19 @@ void SvMetaSlot::Save( SvPersistStream & rStm ) if( nMask & 0x0002 ) rStm.WriteUChar( aImageReflection ); } -sal_Bool SvMetaSlot::IsVariable() const +bool SvMetaSlot::IsVariable() const { return SvMetaAttribute::IsVariable(); } -sal_Bool SvMetaSlot::IsMethod() const +bool SvMetaSlot::IsMethod() const { bool b = SvMetaAttribute::IsMethod(); b |= NULL != GetMethod(); return b; } -OString SvMetaSlot::GetMangleName( sal_Bool bVariable ) const +OString SvMetaSlot::GetMangleName( bool bVariable ) const { if( !bVariable ) { @@ -321,7 +321,7 @@ SvMetaAttribute * SvMetaSlot::GetMethod() const if( aMethod.Is() || !GetRef() ) return aMethod; return ((SvMetaSlot *)GetRef())->GetMethod(); } -sal_Bool SvMetaSlot::GetHasCoreId() const +bool SvMetaSlot::GetHasCoreId() const { if( aHasCoreId.IsSet() || !GetRef() ) return aHasCoreId; return ((SvMetaSlot *)GetRef())->GetHasCoreId(); @@ -356,50 +356,50 @@ const OString& SvMetaSlot::GetDefault() const if( !aDefault.getString().isEmpty() || !GetRef() ) return aDefault.getString(); return ((SvMetaSlot *)GetRef())->GetDefault(); } -sal_Bool SvMetaSlot::GetPseudoSlots() const +bool SvMetaSlot::GetPseudoSlots() const { if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots; return ((SvMetaSlot *)GetRef())->GetPseudoSlots(); } -sal_Bool SvMetaSlot::GetCachable() const +bool SvMetaSlot::GetCachable() const { // Cachable and Volatile are exclusive if( !GetRef() || aCachable.IsSet() || aVolatile.IsSet() ) return aCachable; return ((SvMetaSlot *)GetRef())->GetCachable(); } -sal_Bool SvMetaSlot::GetVolatile() const +bool SvMetaSlot::GetVolatile() const { // Cachable and Volatile are exclusive if( !GetRef() || aVolatile.IsSet() || aCachable.IsSet() ) return aVolatile; return ((SvMetaSlot *)GetRef())->GetVolatile(); } -sal_Bool SvMetaSlot::GetToggle() const +bool SvMetaSlot::GetToggle() const { if( aToggle.IsSet() || !GetRef() ) return aToggle; return ((SvMetaSlot *)GetRef())->GetToggle(); } -sal_Bool SvMetaSlot::GetAutoUpdate() const +bool SvMetaSlot::GetAutoUpdate() const { if( aAutoUpdate.IsSet() || !GetRef() ) return aAutoUpdate; return ((SvMetaSlot *)GetRef())->GetAutoUpdate(); } -sal_Bool SvMetaSlot::GetSynchron() const +bool SvMetaSlot::GetSynchron() const { // Synchron and Asynchron are exclusive if( !GetRef() || aSynchron.IsSet() || aAsynchron.IsSet() ) return aSynchron; return ((SvMetaSlot *)GetRef())->GetSynchron(); } -sal_Bool SvMetaSlot::GetAsynchron() const +bool SvMetaSlot::GetAsynchron() const { // Synchron and Asynchron are exclusive if( !GetRef() || aAsynchron.IsSet() || aSynchron.IsSet() ) return aAsynchron; return ((SvMetaSlot *)GetRef())->GetAsynchron(); } -sal_Bool SvMetaSlot::GetRecordPerItem() const +bool SvMetaSlot::GetRecordPerItem() const { // Record- PerItem, No, PerSet and Manual are exclusive if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet() @@ -407,7 +407,7 @@ sal_Bool SvMetaSlot::GetRecordPerItem() const return aRecordPerItem; return ((SvMetaSlot *)GetRef())->GetRecordPerItem(); } -sal_Bool SvMetaSlot::GetRecordPerSet() const +bool SvMetaSlot::GetRecordPerSet() const { // Record- PerItem, No, PerSet and Manual are exclusive if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet() @@ -415,7 +415,7 @@ sal_Bool SvMetaSlot::GetRecordPerSet() const return aRecordPerSet; return ((SvMetaSlot *)GetRef())->GetRecordPerSet(); } -sal_Bool SvMetaSlot::GetRecordManual() const +bool SvMetaSlot::GetRecordManual() const { // Record- PerItem, No, PerSet and Manual are exclusive if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet() @@ -423,7 +423,7 @@ sal_Bool SvMetaSlot::GetRecordManual() const return aRecordManual; return ((SvMetaSlot *)GetRef())->GetRecordManual(); } -sal_Bool SvMetaSlot::GetNoRecord() const +bool SvMetaSlot::GetNoRecord() const { // Record- PerItem, No, PerSet and Manual are exclusive if( !GetRef() || aRecordPerItem.IsSet() || aNoRecord.IsSet() @@ -431,13 +431,13 @@ sal_Bool SvMetaSlot::GetNoRecord() const return aNoRecord; return ((SvMetaSlot *)GetRef())->GetNoRecord(); } -sal_Bool SvMetaSlot::GetRecordAbsolute() const +bool SvMetaSlot::GetRecordAbsolute() const { if( !GetRef() || aRecordAbsolute.IsSet() ) return aRecordAbsolute; return ((SvMetaSlot *)GetRef())->GetRecordAbsolute(); } -sal_Bool SvMetaSlot::GetHasDialog() const +bool SvMetaSlot::GetHasDialog() const { if( aHasDialog.IsSet() || !GetRef() ) return aHasDialog; return ((SvMetaSlot *)GetRef())->GetHasDialog(); @@ -447,44 +447,44 @@ const OString& SvMetaSlot::GetPseudoPrefix() const if( !aPseudoPrefix.getString().isEmpty() || !GetRef() ) return aPseudoPrefix.getString(); return ((SvMetaSlot *)GetRef())->GetPseudoPrefix(); } -sal_Bool SvMetaSlot::GetMenuConfig() const +bool SvMetaSlot::GetMenuConfig() const { if( aMenuConfig.IsSet() || !GetRef() ) return aMenuConfig; return ((SvMetaSlot *)GetRef())->GetMenuConfig(); } -sal_Bool SvMetaSlot::GetToolBoxConfig() const +bool SvMetaSlot::GetToolBoxConfig() const { if( aToolBoxConfig.IsSet() || !GetRef() ) return aToolBoxConfig; return ((SvMetaSlot *)GetRef())->GetToolBoxConfig(); } -sal_Bool SvMetaSlot::GetStatusBarConfig() const +bool SvMetaSlot::GetStatusBarConfig() const { if( aStatusBarConfig.IsSet() || !GetRef() ) return aStatusBarConfig; return ((SvMetaSlot *)GetRef())->GetStatusBarConfig(); } -sal_Bool SvMetaSlot::GetAccelConfig() const +bool SvMetaSlot::GetAccelConfig() const { if( aAccelConfig.IsSet() || !GetRef() ) return aAccelConfig; return ((SvMetaSlot *)GetRef())->GetAccelConfig(); } -sal_Bool SvMetaSlot::GetFastCall() const +bool SvMetaSlot::GetFastCall() const { if( aFastCall.IsSet() || !GetRef() ) return aFastCall; return ((SvMetaSlot *)GetRef())->GetFastCall(); } -sal_Bool SvMetaSlot::GetContainer() const +bool SvMetaSlot::GetContainer() const { if( aContainer.IsSet() || !GetRef() ) return aContainer; return ((SvMetaSlot *)GetRef())->GetContainer(); } -sal_Bool SvMetaSlot::GetImageRotation() const +bool SvMetaSlot::GetImageRotation() const { if( aImageRotation.IsSet() || !GetRef() ) return aImageRotation; return ((SvMetaSlot *)GetRef())->GetImageRotation(); } -sal_Bool SvMetaSlot::GetImageReflection() const +bool SvMetaSlot::GetImageReflection() const { if( aImageReflection.IsSet() || !GetRef() ) return aImageReflection; return ((SvMetaSlot *)GetRef())->GetImageReflection(); @@ -501,7 +501,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, { SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm ); - sal_Bool bOk = sal_False; + bool bOk = false; bOk |= aDefault.ReadSvIdl( SvHash_Default(), rInStm ); bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm ); bOk |= aHasCoreId.ReadSvIdl( SvHash_HasCoreId(), rInStm ); @@ -525,29 +525,29 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, } if( aCachable.ReadSvIdl( SvHash_Cachable(), rInStm ) ) - SetCachable( aCachable ), bOk = sal_True; + SetCachable( aCachable ), bOk = true; if( aVolatile.ReadSvIdl( SvHash_Volatile(), rInStm ) ) - SetVolatile( aVolatile ), bOk = sal_True; + SetVolatile( aVolatile ), bOk = true; if( aToggle.ReadSvIdl( SvHash_Toggle(), rInStm ) ) - SetToggle( aToggle ), bOk = sal_True; + SetToggle( aToggle ), bOk = true; if( aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm ) ) - SetAutoUpdate( aAutoUpdate ), bOk = sal_True; + SetAutoUpdate( aAutoUpdate ), bOk = true; if( aSynchron.ReadSvIdl( SvHash_Synchron(), rInStm ) ) - SetSynchron( aSynchron ), bOk = sal_True; + SetSynchron( aSynchron ), bOk = true; if( aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm ) ) - SetAsynchron( aAsynchron ), bOk = sal_True; + SetAsynchron( aAsynchron ), bOk = true; if( aRecordAbsolute.ReadSvIdl( SvHash_RecordAbsolute(), rInStm ) ) - SetRecordAbsolute( aRecordAbsolute), bOk = sal_True; + SetRecordAbsolute( aRecordAbsolute), bOk = true; if( aRecordPerItem.ReadSvIdl( SvHash_RecordPerItem(), rInStm ) ) - SetRecordPerItem( aRecordPerItem ), bOk = sal_True; + SetRecordPerItem( aRecordPerItem ), bOk = true; if( aRecordPerSet.ReadSvIdl( SvHash_RecordPerSet(), rInStm ) ) - SetRecordPerSet( aRecordPerSet ), bOk = sal_True; + SetRecordPerSet( aRecordPerSet ), bOk = true; if( aRecordManual.ReadSvIdl( SvHash_RecordManual(), rInStm ) ) - SetRecordManual( aRecordManual ), bOk = sal_True; + SetRecordManual( aRecordManual ), bOk = true; if( aNoRecord.ReadSvIdl( SvHash_NoRecord(), rInStm ) ) - SetNoRecord( aNoRecord ), bOk = sal_True; + SetNoRecord( aNoRecord ), bOk = true; bOk |= aHasDialog.ReadSvIdl( SvHash_HasDialog(), rInStm ); bOk |= aPseudoPrefix.ReadSvIdl( SvHash_PseudoPrefix(), rInStm ); @@ -558,7 +558,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvBOOL aAllConfig; if( aAllConfig.ReadSvIdl( SvHash_AllConfig(), rInStm ) ) - SetAllConfig( aAllConfig ), bOk = sal_True; + SetAllConfig( aAllConfig ), bOk = true; bOk |= aFastCall.ReadSvIdl( SvHash_FastCall(), rInStm ); bOk |= aContainer.ReadSvIdl( SvHash_Container(), rInStm ); bOk |= aImageRotation.ReadSvIdl( SvHash_ImageRotation(), rInStm ); @@ -573,7 +573,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvToken * pTok = rInStm.GetToken_Next(); if( pTok->Is( SvHash_SlotType() ) ) { - sal_Bool bBraket = rInStm.Read( '(' ); + bool bBraket = rInStm.Read( '(' ); if( bBraket || rInStm.Read( '=' ) ) { aSlotType = rBase.ReadKnownType( rInStm ); @@ -800,9 +800,9 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase, } -sal_Bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm ) +bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { - sal_Bool bOk = SvMetaAttribute::Test( rBase, rInStm ); + bool bOk = SvMetaAttribute::Test( rBase, rInStm ); if( bOk ) { SvMetaType * pType = GetType(); @@ -812,17 +812,17 @@ sal_Bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { rBase.SetError( "this attribute is not a slot", rInStm.GetToken() ); rBase.WriteError( rInStm ); - bOk = sal_False; + bOk = false; } } return bOk; } -sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) +bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); - sal_Bool bOk = sal_True; + bool bOk = true; SvMetaAttribute * pAttr = rBase.ReadKnownAttr( rInStm, GetType() ); if( pAttr ) @@ -842,7 +842,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) aStr.append(" is method or variable but not a slot"); rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() ); rBase.WriteError( rInStm ); - bOk = sal_False; + bOk = false; } } else @@ -863,7 +863,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { OSL_FAIL("Illegal definition!"); rInStm.Seek( nTokPos ); - return sal_False; + return false; } SetName( pKnownSlot->GetName().getString(), &rBase ); @@ -875,7 +875,7 @@ sal_Bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) aStr.append(" is method or variable but not a slot"); rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() ); rBase.WriteError( rInStm ); - bOk = sal_False; + bOk = false; } } } @@ -941,7 +941,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix, { sal_uInt16 nMid = 0, nLow = 0; sal_uInt16 nHigh = nListCount - 1; - sal_Bool bFound = sal_False; + bool bFound = false; while ( !bFound && nLow <= nHigh ) { nMid = (nLow + nHigh) >> 1; @@ -960,7 +960,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix, break; } else - bFound = sal_True; + bFound = true; } DBG_ASSERT(!bFound, "Duplicate SlotId!"); @@ -1041,7 +1041,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix, } // The slaves are no master! - xEnumSlot->aPseudoSlots = sal_False; + xEnumSlot->aPseudoSlots = false; xEnumSlot->SetEnumValue(enumValue); if ( !pFirstEnumSlot || xEnumSlot->GetSlotId().GetValue() < pFirstEnumSlot->GetSlotId().GetValue() ) @@ -1094,12 +1094,12 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName, if ( !aMethodName.isEmpty() && aMethodName != "NoExec" ) { - sal_Bool bIn = sal_False; + bool bIn = false; for( size_t n = 0; n < rList.size(); n++ ) { if (rList[n]->equals(aMethodName)) { - bIn=sal_True; + bIn = true; break; } } @@ -1119,12 +1119,12 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName, if (!aMethodName.isEmpty() && aMethodName != "NoState") { - sal_Bool bIn = sal_False; + bool bIn = false; for ( size_t n=0; n < rList.size(); n++ ) { if (rList[n]->equals(aMethodName)) { - bIn=sal_True; + bIn = true; break; } } @@ -1151,7 +1151,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, if ( !GetExport() && !GetHidden() ) return; - sal_Bool bIsEnumSlot = 0 != pEnumValue; + bool bIsEnumSlot = 0 != pEnumValue; rOutStm.WriteCharPtr( "// Slot Nr. " ) .WriteCharPtr( OString::number(nListPos).getStr() ) @@ -1393,7 +1393,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, rOutStm.WriteChar( '.' ); if ( !IsVariable() || !GetType() || GetType()->GetBaseType()->GetType() != TYPE_STRUCT ) - rOutStm.WriteCharPtr( GetMangleName( sal_False ).getStr() ); + rOutStm.WriteCharPtr( GetMangleName( false ).getStr() ); rOutStm.WriteCharPtr( "\"," ); } else @@ -1414,7 +1414,7 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount, { rOutStm.WriteCharPtr( ",\"" ); - rOutStm.WriteCharPtr( GetMangleName( sal_False ).getStr() ); + rOutStm.WriteCharPtr( GetMangleName( false ).getStr() ); rOutStm.WriteCharPtr( "\"" ); } @@ -1517,11 +1517,11 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, OString aSId = aBuf.makeStringAndClear(); sal_uLong nSId2; - sal_Bool bIdOk = sal_False; + bool bIdOk = false; if( rBase.FindId( aSId, &nSId2 ) ) { aSId = OString::number(nSId2); - bIdOk = sal_True; + bIdOk = true; } // if id not found, write always @@ -1538,7 +1538,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, } } -void WriteBool( sal_Bool bSet, SvStream& rStream ) +void WriteBool( bool bSet, SvStream& rStream ) { if ( bSet ) rStream.WriteCharPtr( "TRUE" ).WriteChar( ',' ); diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 265be88a2a21..cf9cfa91cf88 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -29,23 +29,23 @@ SV_IMPL_META_FACTORY1( SvMetaAttribute, SvMetaReference ); SvMetaAttribute::SvMetaAttribute() - : aAutomation( sal_True, sal_False ) - , aExport( sal_True, sal_False ) - , aIsCollection ( sal_False, sal_False ) - , aReadOnlyDoc ( sal_True, sal_False ) - , aHidden( sal_False, sal_False ) - , bNewAttr( sal_False ) + : aAutomation( true, false ) + , aExport( true, false ) + , aIsCollection ( false, false ) + , aReadOnlyDoc ( true, false ) + , aHidden( false, false ) + , bNewAttr( false ) { } SvMetaAttribute::SvMetaAttribute( SvMetaType * pType ) : aType( pType ) - , aAutomation( sal_True, sal_False ) - , aExport( sal_True, sal_False ) - , aIsCollection ( sal_False, sal_False) - , aReadOnlyDoc ( sal_True, sal_False) - , aHidden( sal_False, sal_False ) - , bNewAttr( sal_False ) + , aAutomation( true, false ) + , aExport( true, false ) + , aIsCollection ( false, false) + , aReadOnlyDoc ( true, false) + , aHidden( false, false ) + , bNewAttr( false ) { } @@ -109,19 +109,19 @@ const SvNumberIdentifier & SvMetaAttribute::GetSlotId() const return ((SvMetaAttribute *)GetRef())->GetSlotId(); } -sal_Bool SvMetaAttribute::GetReadonly() const +bool SvMetaAttribute::GetReadonly() const { if( aReadonly.IsSet() || !GetRef() ) return aReadonly; return ((SvMetaAttribute *)GetRef())->GetReadonly(); } -sal_Bool SvMetaAttribute::GetExport() const +bool SvMetaAttribute::GetExport() const { if( aExport.IsSet() || !GetRef() ) return aExport; return ((SvMetaAttribute *)GetRef())->GetExport(); } -sal_Bool SvMetaAttribute::GetHidden() const +bool SvMetaAttribute::GetHidden() const { // when export is set, but hidden is not the default is used if ( aExport.IsSet() && !aHidden.IsSet() ) @@ -132,15 +132,15 @@ sal_Bool SvMetaAttribute::GetHidden() const return ((SvMetaAttribute *)GetRef())->GetHidden(); } -sal_Bool SvMetaAttribute::GetAutomation() const +bool SvMetaAttribute::GetAutomation() const { if( aAutomation.IsSet() || !GetRef() ) return aAutomation; return ((SvMetaAttribute *)GetRef())->GetAutomation(); } -sal_Bool SvMetaAttribute::GetIsCollection() const +bool SvMetaAttribute::GetIsCollection() const { - sal_Bool bRet; + bool bRet; if( aIsCollection.IsSet() || !GetRef() ) { if ( aIsCollection.IsSet() ) @@ -155,57 +155,57 @@ sal_Bool SvMetaAttribute::GetIsCollection() const return ((SvMetaSlot *)GetRef())->GetIsCollection(); } -sal_Bool SvMetaAttribute::GetReadOnlyDoc() const +bool SvMetaAttribute::GetReadOnlyDoc() const { if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc; return ((SvMetaSlot *)GetRef())->GetReadOnlyDoc(); } -sal_Bool SvMetaAttribute::IsMethod() const +bool SvMetaAttribute::IsMethod() const { SvMetaType * pType = GetType(); DBG_ASSERT( pType, "no type for attribute" ); return pType->GetType() == TYPE_METHOD; } -sal_Bool SvMetaAttribute::IsVariable() const +bool SvMetaAttribute::IsVariable() const { SvMetaType * pType = GetType(); return pType->GetType() != TYPE_METHOD; } -OString SvMetaAttribute::GetMangleName( sal_Bool ) const +OString SvMetaAttribute::GetMangleName( bool ) const { return GetName().getString(); } -sal_Bool SvMetaAttribute::Test( SvIdlDataBase & rBase, +bool SvMetaAttribute::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { - sal_Bool bOk = sal_True; + bool bOk = true; if( GetType()->IsItem() && !GetSlotId().IsSet() ) { rBase.SetError( "slot without id declared", rInStm.GetToken() ); rBase.WriteError( rInStm ); - bOk = sal_False; + bOk = false; } return bOk; } -sal_Bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) +bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase, + SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); if( !GetType() ) // no type in ctor passed on aType = rBase.ReadKnownType( rInStm ); - sal_Bool bOk = sal_False; + bool bOk = false; if( GetType() ) { ReadNameSvIdl( rBase, rInStm ); aSlotId.ReadSvIdl( rBase, rInStm ); - bOk = sal_True; + bOk = true; SvToken * pTok = rInStm.GetToken(); if( bOk && pTok->IsChar() && pTok->GetChar() == '(' ) { @@ -379,7 +379,7 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase, } } -sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVar ) const +sal_uLong SvMetaAttribute::MakeSlotValue( SvIdlDataBase & rBase, bool bVar ) const { const SvNumberIdentifier & rId = GetSlotId(); sal_uLong n = rId.GetValue(); @@ -404,14 +404,14 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm if( nT == WRITE_ODL ) { const SvNumberIdentifier & rId = GetSlotId(); - sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY ); + bool bReadonly = GetReadonly() || ( nA & WA_READONLY ); if( (rId.IsSet() && !(nA & WA_STRUCT)) || bReadonly ) { - sal_Bool bVar = IsVariable(); + bool bVar = IsVariable(); if( nA & WA_VARIABLE ) - bVar = sal_True; + bVar = true; else if( nA & WA_METHOD ) - bVar = sal_False; + bVar = false; WriteTab( rOutStm, nTab ); rOutStm.WriteCharPtr( "//class SvMetaAttribute" ) << endl; @@ -432,14 +432,14 @@ void SvMetaAttribute::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm } void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm, - sal_Bool bSet ) + bool bSet ) { rOutStm << endl; SvMetaType * pType = GetType(); SvMetaType * pBaseType = pType->GetBaseType(); // for Set the return is always void - sal_Bool bVoid = bSet; + bool bVoid = bSet; if( pBaseType->GetType() == TYPE_METHOD ) bVoid = pBaseType->GetReturnType()->GetBaseType()->GetName().getString() == "void"; @@ -547,11 +547,11 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, else if ( !GetAutomation() || !GetExport() ) return; - sal_Bool bVariable; + bool bVariable; if( nA & WA_VARIABLE ) - bVariable = sal_True; + bVariable = true; else if( nA & WA_METHOD ) - bVariable = sal_False; + bVariable = false; else bVariable = IsVariable(); @@ -596,7 +596,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, if( nT == WRITE_C_HEADER ) rOutStm.WriteChar( ';' ) << endl << endl; else - WriteCSource( rBase, rOutStm, sal_False ); + WriteCSource( rBase, rOutStm, false ); } else if ( bVariable && IsVariable() ) { @@ -611,7 +611,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, { OString name = GetName().getString(); - sal_Bool bReadonly = GetReadonly() || ( nA & WA_READONLY ); + bool bReadonly = GetReadonly() || ( nA & WA_READONLY ); if ( !bReadonly && !IsMethod() ) { // allocation @@ -626,7 +626,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, if( nT == WRITE_C_HEADER ) rOutStm.WriteChar( ';' ) << endl << endl; else - WriteCSource( rBase, rOutStm, sal_True ); + WriteCSource( rBase, rOutStm, true ); } // access @@ -639,7 +639,7 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm, if( nT == WRITE_C_HEADER ) rOutStm.WriteChar( ';' ) << endl << endl; else - WriteCSource( rBase, rOutStm, sal_False ); + WriteCSource( rBase, rOutStm, false ); } } } @@ -743,13 +743,13 @@ void SvMetaAttribute::WriteHelpId( SvIdlDataBase &, SvStream &, HelpIdTable& ) SV_IMPL_META_FACTORY1( SvMetaType, SvMetaExtern ); #define CTOR \ - : aCall0( CALL_VALUE, sal_False ) \ - , aCall1( CALL_VALUE, sal_False ) \ - , aSbxDataType( 0, sal_False ) \ + : aCall0( CALL_VALUE, false ) \ + , aCall1( CALL_VALUE, false ) \ + , aSbxDataType( 0, false ) \ , pAttrList( NULL ) \ , nType( TYPE_BASE ) \ - , bIsItem( sal_False ) \ - , bIsShell( sal_False ) \ + , bIsItem( false ) \ + , bIsShell( false ) \ , cParserChar( 'h' ) SvMetaType::SvMetaType() @@ -799,8 +799,8 @@ void SvMetaType::Load( SvPersistStream & rStm ) if( nMask & 0x0040 ) rStm >> aSbxName; if( nMask & 0x0080 ) rStm >> aOdlName; if( nMask & 0x0100 ) rStm >> GetAttrList(); - if( nMask & 0x0200 ) bIsItem = sal_True; - if( nMask & 0x0400 ) bIsShell = sal_True; + if( nMask & 0x0200 ) bIsItem = true; + if( nMask & 0x0400 ) bIsShell = true; if( nMask & 0x0800 ) { sal_uInt16 nT; @@ -906,7 +906,7 @@ OString SvMetaType::GetBasicPostfix() const makeStringAndClear(); } -sal_Bool SvMetaType::GetIn() const +bool SvMetaType::GetIn() const { if( aIn.IsSet() || !GetRef() ) return aIn; @@ -914,7 +914,7 @@ sal_Bool SvMetaType::GetIn() const return ((SvMetaType *)GetRef())->GetIn(); } -sal_Bool SvMetaType::GetOut() const +bool SvMetaType::GetOut() const { if( aOut.IsSet() || !GetRef() ) return aOut; @@ -1002,7 +1002,7 @@ const OString& SvMetaType::GetCName() const return ((SvMetaType *)GetRef())->GetCName(); } -sal_Bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase ) +bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase ) { aSvName.setString(rName); aSbxName.setString(rName); @@ -1026,10 +1026,10 @@ OString SvMetaType::GetCString() const return out.makeStringAndClear(); } -sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) +bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, + SvTokenStream & rInStm ) { - sal_Bool bOk = sal_False; + bool bOk = false; sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); @@ -1037,7 +1037,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, || pTok->Is( SvHash_shell() ) ) { if( pTok->Is( SvHash_shell() ) ) - bIsShell = sal_True; + bIsShell = true; SetType( TYPE_CLASS ); bOk = ReadNamesSvIdl( rBase, rInStm ); @@ -1051,7 +1051,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, { SetType( TYPE_UNION ); if( ReadNameSvIdl( rBase, rInStm ) ) - return sal_True; + return true; } else if( pTok->Is( SvHash_enum() ) ) { @@ -1062,7 +1062,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, || pTok->Is( SvHash_item() ) ) { if( pTok->Is( SvHash_item() ) ) - bIsItem = sal_True; + bIsItem = true; SvMetaType * pType = rBase.ReadKnownType( rInStm ); if( pType ) @@ -1076,12 +1076,12 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, if( rInStm.Read( ')' ) ) { SetType( TYPE_METHOD ); - bOk = sal_True; + bOk = true; } } else { - bOk = sal_True; + bOk = true; } } } @@ -1099,15 +1099,15 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase, return bOk; } -sal_Bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) +bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase, + SvTokenStream & rInStm ) { if( ReadHeaderSvIdl( rBase, rInStm ) ) { rBase.Write(OString('.')); return SvMetaExtern::ReadSvIdl( rBase, rInStm ); } - return sal_False; + return false; } void SvMetaType::WriteSvIdl @@ -1229,10 +1229,10 @@ void SvMetaType::Write( SvIdlDataBase & rBase, SvStream & rOutStm, } } -sal_Bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) +bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase, + SvTokenStream & rInStm ) { - sal_Bool bOk = ReadNameSvIdl( rBase, rInStm ); + bool bOk = ReadNameSvIdl( rBase, rInStm ); return bOk; } @@ -1467,8 +1467,8 @@ void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) } } -sal_Bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) +bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase, + SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); if( rInStm.Read( '(' ) ) @@ -1477,11 +1477,11 @@ sal_Bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase, if( rInStm.Read( ')' ) ) { SetType( TYPE_METHOD ); - return sal_True; + return true; } } rInStm.Seek( nTokPos ); - return sal_False; + return false; } void SvMetaType::WriteMethodArgs @@ -1604,8 +1604,8 @@ void SvMetaType::WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, case WRITE_ODL: { - sal_Bool bIn = GetIn(); - sal_Bool bOut = GetOut(); + bool bIn = GetIn(); + bool bOut = GetOut(); if( bIn || bOut ) { if( bIn && bOut ) @@ -1808,12 +1808,12 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm ) if( nMask & 0x01 ) write_uInt16_lenPrefixed_uInt8s_FromOString(rStm, aEnumValue); } -sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase, +bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { if( !ReadNameSvIdl( rBase, rInStm ) ) - return sal_False; - return sal_True; + return false; + return true; } void SvMetaEnumValue::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 ) @@ -1889,7 +1889,7 @@ void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase, sal_uInt32 nTokPos = rInStm.Tell(); SvMetaEnumValueRef aEnumVal = new SvMetaEnumValue(); - sal_Bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm ); + bool bOk = aEnumVal->ReadSvIdl( rBase, rInStm ); if( bOk ) { if( aEnumValueList.empty() ) @@ -1922,7 +1922,7 @@ void SvMetaTypeEnum::WriteContextSvIdl( SvIdlDataBase & rBase, } } -sal_Bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, +bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); @@ -1930,10 +1930,10 @@ sal_Bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, && GetType() == TYPE_ENUM ) { if( SvMetaName::ReadSvIdl( rBase, rInStm ) ) - return sal_True; + return true; } rInStm.Seek( nTokPos ); - return sal_False; + return false; } void SvMetaTypeEnum::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, |