diff options
Diffstat (limited to 'idl/source/objects/module.cxx')
| -rwxr-xr-x[-rw-r--r--] | idl/source/objects/module.cxx | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 3fb97326dd97..f8d68dabbbf6 100644..100755 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -52,16 +52,16 @@ SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern ); *************************************************************************/ SvMetaModule::SvMetaModule() #ifdef IDL_COMPILER - : bImported( FALSE ) - , bIsModified( FALSE ) + : bImported( sal_False ) + , bIsModified( sal_False ) #endif { } #ifdef IDL_COMPILER -SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp ) +SvMetaModule::SvMetaModule( const String & rIdlFileName, sal_Bool bImp ) : aIdlFileName( rIdlFileName ) - , bImported( bImp ), bIsModified( FALSE ) + , bImported( bImp ), bIsModified( sal_False ) { } #endif @@ -78,10 +78,10 @@ SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp ) #define MODULE_VER 0x0001 void SvMetaModule::Load( SvPersistStream & rStm ) { - bImported = TRUE; // immer importiert + bImported = sal_True; // immer importiert SvMetaExtern::Load( rStm ); - USHORT nVer; + sal_uInt16 nVer; rStm >> nVer; // Version DBG_ASSERT( (nVer & ~IDL_WRITE_MASK) == MODULE_VER, "false version" ); @@ -96,7 +96,7 @@ void SvMetaModule::Load( SvPersistStream & rStm ) rStm.ReadByteString( aModulePrefix ); // Compiler Daten lesen - USHORT nCmpLen; + sal_uInt16 nCmpLen; rStm >> nCmpLen; #ifdef IDL_COMPILER DBG_ASSERT( (nVer & IDL_WRITE_MASK) == IDL_WRITE_COMPILER, @@ -122,7 +122,7 @@ void SvMetaModule::Save( SvPersistStream & rStm ) { SvMetaExtern::Save( rStm ); - rStm << (USHORT)(MODULE_VER | IDL_WRITE_COMPILER); // Version + rStm << (sal_uInt16)(MODULE_VER | IDL_WRITE_COMPILER); // Version rStm << aClassList; rStm << aTypeList; @@ -134,17 +134,17 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm.WriteByteString( aModulePrefix ); // Compiler Daten schreiben - USHORT nCmpLen = 0; - ULONG nLenPos = rStm.Tell(); + sal_uInt16 nCmpLen = 0; + sal_uLong nLenPos = rStm.Tell(); rStm << nCmpLen; #ifdef IDL_COMPILER rStm << aBeginName; rStm << aEndName; rStm << aNextName; // Laenge der Compiler Daten schreiben - ULONG nPos = rStm.Tell(); + sal_uLong nPos = rStm.Tell(); rStm.Seek( nLenPos ); - rStm << (USHORT)( nPos - nLenPos - sizeof( USHORT ) ); + rStm << (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) ); rStm.Seek( nPos ); #endif } @@ -158,12 +158,12 @@ void SvMetaModule::Save( SvPersistStream & rStm ) |* Letzte Aenderung MM 12.12.94 |* *************************************************************************/ -BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase ) +sal_Bool SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase ) { if( pBase ) { if( pBase->GetModule( rName ) ) - return FALSE; + return sal_False; } return SvMetaExtern::SetName( rName ); } @@ -174,17 +174,17 @@ BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase ) |* |* Beschreibung *************************************************************************/ -BOOL SvMetaModule::FillNextName( SvGlobalName * pName ) +sal_Bool SvMetaModule::FillNextName( SvGlobalName * pName ) { *pName = aNextName; if( aNextName < aEndName ) { ++aNextName; - bIsModified = TRUE; - return TRUE; + bIsModified = sal_True; + return sal_True; } - return FALSE; + return sal_False; } /************************************************************************* @@ -200,7 +200,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, aHelpFileName.ReadSvIdl( SvHash_HelpFile(), rInStm ); if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) ) { - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.GetBuffer() ) ) ) { ByteString aStr = "cannot read file: "; @@ -222,7 +222,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, *************************************************************************/ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, - USHORT nTab ) + sal_uInt16 nTab ) { SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab ); if( aTypeLibFile.Len() || aSlotIdFile.Len() || aTypeLibFile.Len() ) @@ -256,7 +256,7 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase & rBase, void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); if( rInStm.GetToken()->Is( SvHash_interface() ) || rInStm.GetToken()->Is( SvHash_shell() ) ) { @@ -296,7 +296,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, } else if( rInStm.GetToken()->Is( SvHash_include() ) ) { - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; rInStm.GetToken_Next(); SvToken * pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) @@ -313,7 +313,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, // Fehler zuruecksetzen rBase.SetError( SvIdlError() ); - UINT32 nBeginPos = 0xFFFFFFFF; // kann mit Tell nicht vorkommen + sal_uInt32 nBeginPos = 0xFFFFFFFF; // kann mit Tell nicht vorkommen while( nBeginPos != aTokStm.Tell() ) { nBeginPos = aTokStm.Tell(); @@ -369,10 +369,10 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, *************************************************************************/ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, - USHORT nTab ) + sal_uInt16 nTab ) { SvMetaExtern::WriteContextSvIdl( rBase, rOutStm, nTab ); - ULONG n; + sal_uLong n; for( n = 0; n < aTypeList.Count(); n++ ) { WriteTab( rOutStm, nTab ); @@ -399,13 +399,13 @@ void SvMetaModule::WriteContextSvIdl( SvIdlDataBase & rBase, |* Beschreibung |* *************************************************************************/ -BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) +sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { - bIsModified = TRUE; // bisher immer wenn Compiler laueft + bIsModified = sal_True; // bisher immer wenn Compiler laueft - UINT32 nTokPos = rInStm.Tell(); + sal_uInt32 nTokPos = rInStm.Tell(); SvToken * pTok = rInStm.GetToken_Next(); - BOOL bOk = FALSE; + sal_Bool bOk = sal_False; bOk = pTok->Is( SvHash_module() ); if( bOk ) { @@ -448,7 +448,7 @@ BOOL SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) |* *************************************************************************/ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, - USHORT nTab ) + sal_uInt16 nTab ) { rOutStm << SvHash_module()->GetName().GetBuffer() << endl << '\"'; @@ -464,7 +464,7 @@ void SvMetaModule::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, *************************************************************************/ void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) { - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { SvMetaClass * pClass = aClassList.GetObject( n ); pClass->WriteSfx( rBase, rOutStm ); @@ -474,7 +474,7 @@ void SvMetaModule::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, Table* pTable ) { - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { SvMetaClass * pClass = aClassList.GetObject( n ); pClass->WriteHelpIds( rBase, rOutStm, pTable ); @@ -486,7 +486,7 @@ void SvMetaModule::WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, *************************************************************************/ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, - USHORT nTab, + sal_uInt16 nTab, WriteType nT, WriteAttribute nA ) { SvMetaExtern::WriteAttributes( rBase, rOutStm, nTab, nT, nA ); @@ -506,7 +506,7 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase, void SvMetaModule::WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm, SvNamePosList & rList ) { - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { SvMetaClass * pClass = aClassList.GetObject( n ); if( !pClass->IsShell() && pClass->GetAutomation() ) @@ -525,7 +525,7 @@ void SvMetaModule::WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm, |* SvMetaModule::Write() *************************************************************************/ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm, - USHORT nTab, + sal_uInt16 nTab, WriteType nT, WriteAttribute nA ) { switch ( nT ) @@ -547,19 +547,19 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm, rOutStm << "importlib(\"STDOLE.TLB\");" << endl; /* - for( ULONG n = 0; n < aTypeList.Count(); n++ ) + for( sal_uLong n = 0; n < aTypeList.Count(); n++ ) { SvMetaType * pType = aTypeList.GetObject( n ); if( !pType ->Write( rBase, rOutStm, nTab +1, nT, nA ) ) - return FALSE; + return sal_False; } */ /* - for( ULONG n = 0; n < rBase.GetModuleList().Count(); n++ ) + for( sal_uLong n = 0; n < rBase.GetModuleList().Count(); n++ ) { SvMetaModule * pModule = rBase.GetModuleList().GetObject( n ); const SvMetaTypeMemberList &rTypeList = pModule->GetTypeList(); - for( ULONG n = 0; n < rTypeList.Count(); n++ ) + for( sal_uLong n = 0; n < rTypeList.Count(); n++ ) { SvMetaType * pType = rTypeList.GetObject( n ); pType->Write( rBase, rOutStm, nTab +1, nT, nA ); @@ -567,7 +567,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm, } */ - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { SvMetaClass * pClass = aClassList.GetObject( n ); if( !pClass->IsShell() && pClass->GetAutomation() ) @@ -591,7 +591,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm, rOutStm << "</MODULE>" << endl << endl; rOutStm << "<CLASSES>" << endl; - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { SvMetaClass * pClass = aClassList.GetObject( n ); if( !pClass->IsShell() ) @@ -607,7 +607,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm, { rOutStm << " ( "; - for( ULONG m=0; m<rClassList.Count(); m++ ) + for( sal_uLong m=0; m<rClassList.Count(); m++ ) { SvClassElement *pEle = rClassList.GetObject(m); SvMetaClass *pCl = pEle->GetClass(); @@ -629,7 +629,7 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm, case WRITE_C_SOURCE: case WRITE_C_HEADER: { - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { SvMetaClass * pClass = aClassList.GetObject( n ); if( !pClass->IsShell() /* && pClass->GetAutomation() */ ) @@ -652,7 +652,7 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, // rOutStm << "#pragma CHARSET IBMPC" << endl; if( aSlotIdFile.Len() ) rOutStm << "//#include <" << aSlotIdFile.GetBuffer() << '>' << endl; - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { aClassList.GetObject( n )->WriteSrc( rBase, rOutStm, pTable ); } @@ -662,9 +662,9 @@ void SvMetaModule::WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, |* SvMetaModule::WriteHxx() *************************************************************************/ void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, - USHORT nTab ) + sal_uInt16 nTab ) { - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { SvMetaClass * pClass = aClassList.GetObject( n ); pClass->WriteHxx( rBase, rOutStm, nTab ); @@ -675,9 +675,9 @@ void SvMetaModule::WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, |* SvMetaModule::WriteCxx() *************************************************************************/ void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, - USHORT nTab ) + sal_uInt16 nTab ) { - for( ULONG n = 0; n < aClassList.Count(); n++ ) + for( sal_uLong n = 0; n < aClassList.Count(); n++ ) { SvMetaClass * pClass = aClassList.GetObject( n ); pClass->WriteCxx( rBase, rOutStm, nTab ); |