diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-12-19 21:10:10 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-19 21:11:58 +0000 |
commit | 6ade792d3e8f3244dcbb445a540939158820e50a (patch) | |
tree | 29da8cc2411220a79a99158c2ebfa076a96e6444 /idl/source | |
parent | 864bc59e66e92eabeef26222301607a7a5745bea (diff) |
IDL_COMPILER is always defined
Diffstat (limited to 'idl/source')
-rw-r--r-- | idl/source/objects/basobj.cxx | 11 | ||||
-rw-r--r-- | idl/source/objects/bastype.cxx | 5 | ||||
-rw-r--r-- | idl/source/objects/module.cxx | 13 | ||||
-rw-r--r-- | idl/source/objects/object.cxx | 3 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 4 | ||||
-rw-r--r-- | idl/source/objects/types.cxx | 11 | ||||
-rw-r--r-- | idl/source/prj/database.cxx | 3 |
7 files changed, 0 insertions, 50 deletions
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 4f9c15d3e762..3d688a35c29d 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -50,7 +50,6 @@ void SvMetaObject::Save( SvPersistStream & ) { } -#ifdef IDL_COMPILER void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab ) { while( nTab-- ) @@ -128,8 +127,6 @@ void SvMetaObject::WriteHxx( SvIdlDataBase &, SvStream &, sal_uInt16 /*nTab */ ) { } -#endif - SV_IMPL_META_FACTORY1( SvMetaName, SvMetaObject ); SvMetaName::SvMetaName() { @@ -178,7 +175,6 @@ sal_Bool SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * ) return sal_True; } -#ifdef IDL_COMPILER sal_Bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { @@ -410,7 +406,6 @@ void SvMetaName::WriteContext( SvIdlDataBase &, SvStream &, WriteType, WriteAttribute ) { } -#endif // IDL_COMPILER SV_IMPL_META_FACTORY1( SvMetaReference, SvMetaName ); @@ -507,14 +502,11 @@ SvMetaModule * SvMetaExtern::GetModule() const const SvGlobalName & SvMetaExtern::GetUUId() const { -#ifdef IDL_COMPILER if( aUUId == SvGlobalName() ) GetModule()->FillNextName( &((SvMetaExtern *)this)->aUUId ); -#endif return aUUId; } -#ifdef IDL_COMPILER void SvMetaExtern::SetModule( SvIdlDataBase & rBase ) { pModule = (SvMetaModule *)rBase.GetStack().Get( TYPE( SvMetaModule ) ); @@ -592,7 +584,4 @@ void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, << ")," << endl; } -#endif // IDL_COMPILER - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index c7c391d60533..15c56c088ea0 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -37,7 +37,6 @@ #include <hash.hxx> #include <database.hxx> -#ifdef IDL_COMPILER static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm, sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue ) { @@ -67,7 +66,6 @@ static sal_Bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInSt rInStm.Seek( nTokPos ); return sal_False; } -#endif sal_uInt32 SvUINT32::Read( SvStream & rStm ) { @@ -140,7 +138,6 @@ SvStream& operator >> (SvStream & rStm, SvVersion & r ) } -#ifdef IDL_COMPILER sal_Bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); @@ -436,7 +433,5 @@ sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm ) << ')'; return sal_True; } -#endif //IDL_COMPILER - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index ef141a2135b7..c2be3e232494 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -39,20 +39,16 @@ SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern ); SvMetaModule::SvMetaModule() -#ifdef IDL_COMPILER : bImported( sal_False ) , bIsModified( sal_False ) -#endif { } -#ifdef IDL_COMPILER SvMetaModule::SvMetaModule( const String & rIdlFileName, sal_Bool bImp ) : aIdlFileName( rIdlFileName ) , bImported( bImp ), bIsModified( sal_False ) { } -#endif #define MODULE_VER 0x0001 void SvMetaModule::Load( SvPersistStream & rStm ) @@ -77,15 +73,11 @@ void SvMetaModule::Load( SvPersistStream & rStm ) // read compiler data sal_uInt16 nCmpLen; rStm >> nCmpLen; -#ifdef IDL_COMPILER DBG_ASSERT( (nVer & IDL_WRITE_MASK) == IDL_WRITE_COMPILER, "no idl compiler format" ); rStm >> aBeginName; rStm >> aEndName; rStm >> aNextName; -#else - rStm->SeekRel( nCmpLen ); -#endif } void SvMetaModule::Save( SvPersistStream & rStm ) @@ -107,7 +99,6 @@ void SvMetaModule::Save( SvPersistStream & rStm ) sal_uInt16 nCmpLen = 0; sal_uLong nLenPos = rStm.Tell(); rStm << nCmpLen; -#ifdef IDL_COMPILER rStm << aBeginName; rStm << aEndName; rStm << aNextName; @@ -116,7 +107,6 @@ void SvMetaModule::Save( SvPersistStream & rStm ) rStm.Seek( nLenPos ); rStm << (sal_uInt16)( nPos - nLenPos - sizeof( sal_uInt16 ) ); rStm.Seek( nPos ); -#endif } sal_Bool SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase ) @@ -129,7 +119,6 @@ sal_Bool SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase return SvMetaExtern::SetName( rName ); } -#ifdef IDL_COMPILER sal_Bool SvMetaModule::FillNextName( SvGlobalName * pName ) { *pName = aNextName; @@ -549,6 +538,4 @@ void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, } } -#endif // IDL_COMPILER - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 30cd08c758f5..0b3e1cf193e3 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -135,7 +135,6 @@ void SvMetaClass::Save( SvPersistStream & rStm ) if( nMask & 0x10 ) rStm << aAutomation; } -#ifdef IDL_COMPILER void SvMetaClass::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { @@ -751,6 +750,4 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 ) << '}' << endl; } -#endif // IDL_COMPILER - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index d24a2a271012..831afa8f1758 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -503,7 +503,6 @@ const ByteString& SvMetaSlot::GetUnoName() const return ((SvMetaSlot *)GetRef())->GetUnoName(); } -#ifdef IDL_COMPILER void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { @@ -1721,7 +1720,4 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm ) rStrm << endl; } -#endif // IDL_COMPILER - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index fa6d473a0f1f..06db9ed18910 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -188,7 +188,6 @@ rtl::OString SvMetaAttribute::GetMangleName( sal_Bool ) const return GetName(); } -#ifdef IDL_COMPILER sal_Bool SvMetaAttribute::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { @@ -751,8 +750,6 @@ void SvMetaAttribute::WriteHelpId( SvIdlDataBase &, SvStream &, Table * ) { } -#endif // IDL_COMPILER - SV_IMPL_META_FACTORY1( SvMetaType, SvMetaExtern ); #define CTOR \ : aCall0( CALL_VALUE, sal_False ) \ @@ -1030,7 +1027,6 @@ sal_Bool SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase ) return SvMetaReference::SetName( rName, pBase ); } -#ifdef IDL_COMPILER ByteString SvMetaType::GetCString() const { rtl::OStringBuffer out( GetSvName() ); @@ -1751,8 +1747,6 @@ void SvMetaType::WriteParamNames( SvIdlDataBase & rBase, } } -#endif // IDL_COMPILER - SV_IMPL_META_FACTORY1( SvMetaTypeString, SvMetaType ); SvMetaTypeString::SvMetaTypeString() : SvMetaType( "String", "SbxSTRING", "BSTR", 's', "char *", "String", "$" ) @@ -1802,7 +1796,6 @@ void SvMetaEnumValue::Save( SvPersistStream & rStm ) if( nMask & 0x01 ) rStm.WriteByteString( aEnumValue ); } -#ifdef IDL_COMPILER sal_Bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { @@ -1824,7 +1817,6 @@ void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16, else rOutStm << GetName().GetBuffer(); } -#endif // IDL_COMPILER SV_IMPL_META_FACTORY1( SvMetaTypeEnum, SvMetaType ); SvMetaTypeEnum::SvMetaTypeEnum() @@ -1863,7 +1855,6 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm ) if( nMask & 0x02 ) rStm.WriteByteString( aPrefix ); } -#ifdef IDL_COMPILER void SvMetaTypeEnum::ReadContextSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { @@ -1958,8 +1949,6 @@ void SvMetaTypeEnum::WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, rOutStm << endl; } -#endif // IDL_COMPILER - SV_IMPL_META_FACTORY1( SvMetaTypevoid, SvMetaType ); SvMetaTypevoid::SvMetaTypevoid() : SvMetaType( "void", "SbxVOID", "void", 'v', "void", "", "" ) diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 06d0037511c7..a7df034958d9 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -185,7 +185,6 @@ void SvIdlDataBase::Push( SvMetaObject * pObj ) GetStack().Push( pObj ); } -#ifdef IDL_COMPILER sal_Bool SvIdlDataBase::FindId( const rtl::OString& rIdName, sal_uLong * pVal ) { if( pIdTable ) @@ -901,6 +900,4 @@ bool SvIdlDataBase::WriteDepFile( return rStream.GetError() == SVSTREAM_OK; } -#endif // IDL_COMPILER - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |