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 | |
parent | 864bc59e66e92eabeef26222301607a7a5745bea (diff) |
IDL_COMPILER is always defined
Diffstat (limited to 'idl')
-rw-r--r-- | idl/Executable_svidl.mk | 4 | ||||
-rw-r--r-- | idl/inc/basobj.hxx | 8 | ||||
-rw-r--r-- | idl/inc/bastype.hxx | 14 | ||||
-rw-r--r-- | idl/inc/database.hxx | 11 | ||||
-rw-r--r-- | idl/inc/globals.hxx | 2 | ||||
-rw-r--r-- | idl/inc/module.hxx | 4 | ||||
-rw-r--r-- | idl/inc/object.hxx | 4 | ||||
-rw-r--r-- | idl/inc/slot.hxx | 4 | ||||
-rw-r--r-- | idl/inc/types.hxx | 14 | ||||
-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 |
16 files changed, 0 insertions, 115 deletions
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index 407ee3766c55..0fe2ee2e9fd5 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -39,10 +39,6 @@ $(eval $(call gb_Executable_add_api,svidl,\ udkapi \ )) -$(eval $(call gb_Executable_add_defs,svidl,\ - -DIDL_COMPILER \ -)) - $(eval $(call gb_Executable_add_linked_libs,svidl,\ tl \ sal \ diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index ff1d7b48b569..d40aab316c18 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -79,7 +79,6 @@ public: SV_DECL_META_FACTORY1( SvMetaObject, SvPersistBase, 14 ) SvMetaObject(); -#ifdef IDL_COMPILER static void WriteTab( SvStream & rOutStm, sal_uInt16 nTab ); static sal_Bool TestAndSeekSpaceOnly( SvStream &, sal_uLong nBegPos ); static void Back2Delemitter( SvStream & ); @@ -93,7 +92,6 @@ public: virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); -#endif }; SV_DECL_IMPL_REF(SvMetaObject) SV_DECL_PERSIST_LIST(SvMetaObject,SvMetaObject *) @@ -135,7 +133,6 @@ class SvMetaName : public SvMetaObject SvString aDescription; protected: -#ifdef IDL_COMPILER virtual sal_Bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm, char c = '\0' ); @@ -150,7 +147,6 @@ protected: WriteType, WriteAttribute = 0); virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0); -#endif public: SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 ) SvMetaName(); @@ -164,14 +160,12 @@ public: virtual const SvString & GetConfigName() const{ return aConfigName; } virtual const SvString& GetDescription() const{ return aDescription; } -#ifdef IDL_COMPILER virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0); void WriteDescription( SvStream& rOutStm ); -#endif }; SV_DECL_IMPL_REF(SvMetaName) SV_DECL_IMPL_PERSIST_LIST(SvMetaName,SvMetaName *) @@ -242,7 +236,6 @@ public: const SvGlobalName &GetUUId() const; const SvVersion & GetVersion() const { return aVersion; } -#ifdef IDL_COMPILER void SetModule( SvIdlDataBase & rBase ); virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); @@ -255,7 +248,6 @@ protected: SvStream & rOutStm, sal_uInt16 nTab ); virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0); -#endif }; SV_DECL_IMPL_REF(SvMetaExtern) SV_DECL_IMPL_PERSIST_LIST(SvMetaExtern,SvMetaExtern *) diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index 3d20e62f967b..7fdeafd36a33 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -150,11 +150,9 @@ public: friend SvStream& operator << (SvStream &, const SvBOOL &); friend SvStream& operator >> (SvStream &, SvBOOL &); -#ifdef IDL_COMPILER sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm ); ByteString GetSvIdlString( SvStringHashEntry * pName ); -#endif }; @@ -168,11 +166,9 @@ public: friend SvStream& operator >> (SvStream &, SvIdentifier &); sal_Bool IsSet() const { return Len() != 0; } -#ifdef IDL_COMPILER sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, sal_uInt16 nTab ); -#endif }; @@ -192,11 +188,9 @@ public: friend SvStream& operator << (SvStream &, const SvNumberIdentifier &); friend SvStream& operator >> (SvStream &, SvNumberIdentifier &); -#ifdef IDL_COMPILER sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); sal_Bool ReadSvIdl( SvIdlDataBase &, SvStringHashEntry * pName, SvTokenStream & rInStm ); -#endif }; @@ -210,11 +204,9 @@ public: friend SvStream& operator << (SvStream &, const SvString &); friend SvStream& operator >> (SvStream &, SvString &); -#ifdef IDL_COMPILER sal_Bool ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); sal_Bool WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm, sal_uInt16 nTab ); -#endif }; @@ -222,11 +214,9 @@ class SvHelpText : public SvString { public: SvHelpText() {} -#ifdef IDL_COMPILER sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); sal_Bool WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); -#endif }; @@ -238,10 +228,8 @@ class SvUUId : public SvGlobalName { public: SvUUId() {} -#ifdef IDL_COMPILER sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); sal_Bool WriteSvIdl( SvStream & rOutStm ); -#endif }; @@ -266,10 +254,8 @@ public: friend SvStream& operator << (SvStream &, const SvVersion &); friend SvStream& operator >> (SvStream &, SvVersion &); -#ifdef IDL_COMPILER sal_Bool ReadSvIdl( SvTokenStream & rInStm ); sal_Bool WriteSvIdl( SvStream & rOutStm ); -#endif }; diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index f3ebecfbf7ce..a6f8bc77a6ea 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -35,15 +35,11 @@ #include <rtl/string.hxx> #include <tools/pstm.hxx> -#ifdef IDL_COMPILER #include <rtl/ustring.hxx> #include <set> -#endif class SvCommand; -#ifdef IDL_COMPILER - class SvIdlError { rtl::OString aText; @@ -65,7 +61,6 @@ public: return *this; } }; -#endif class SvIdlDataBase { @@ -87,7 +82,6 @@ class SvIdlDataBase SvMetaTypeMemberList aTmpTypeList; // not persistent protected: -#ifdef IDL_COMPILER ::std::set< ::rtl::OUString > m_DepFiles; SvMetaObjectMemberStack aContextStack; String aPath; @@ -97,7 +91,6 @@ protected: aUsedTypes.Clear(); aIFaceName = rtl::OString(); } -#endif public: explicit SvIdlDataBase( const SvCommand& rCmd ); ~SvIdlDataBase(); @@ -118,7 +111,6 @@ public: rtl::OString aIFaceName; SvNumberIdentifier aStructSlotId; -#ifdef IDL_COMPILER void StartNewFile( const String& rName ); void SetExportFile( const String& rName ) { aExportFile = rName; } @@ -162,10 +154,8 @@ public: SvMetaClass * ReadKnownClass( SvTokenStream & rInStm ); void AddDepFile(String const& rFileName); bool WriteDepFile(SvFileStream & rStream, ::rtl::OUString const& rTarget); -#endif }; -#ifdef IDL_COMPILER class SvIdlWorkingBase : public SvIdlDataBase { public: @@ -180,7 +170,6 @@ public: sal_Bool WriteCSV( SvStream& ); sal_Bool WriteDocumentation( SvStream& ); }; -#endif #endif // _DATABASE_HXX diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 525c2a9e27e2..9a82669555ad 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -29,7 +29,6 @@ #ifndef _GLOBALS_HXX #define _GLOBALS_HXX -#ifdef IDL_COMPILER #include <hash.hxx> #ifdef ICC @@ -238,7 +237,6 @@ HASH_INLINE(Description) HASH_INLINE(UnoName) -#endif // IDL_COMPILER #endif // _GLOBALS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 964cf148b87a..633187c817cb 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -53,7 +53,6 @@ class SvMetaModule : public SvMetaExtern SvString aTypeLibFile; SvString aModulePrefix; -#ifdef IDL_COMPILER sal_Bool bImported : 1, bIsModified : 1; SvGlobalName aBeginName; @@ -64,7 +63,6 @@ protected: virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); -#endif public: SV_DECL_META_FACTORY1( SvMetaModule, SvMetaExtern, 13 ) SvMetaModule(); @@ -81,7 +79,6 @@ public: const SvMetaTypeMemberList & GetTypeList() const { return aTypeList; } const SvMetaClassMemberList & GetClassList() const { return aClassList; } -#ifdef IDL_COMPILER SvMetaModule( const String & rIdlFileName, sal_Bool bImported ); @@ -105,7 +102,6 @@ public: virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); -#endif }; SV_DECL_IMPL_REF(SvMetaModule) SV_DECL_IMPL_PERSIST_LIST(SvMetaModule,SvMetaModule *) diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index a39c7e917d60..bf049898c138 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -89,7 +89,6 @@ class SvMetaClass : public SvMetaType sal_Bool TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm, SvMetaAttribute & rAttr ) const; -#ifdef IDL_COMPILER void WriteSlotStubs( const ByteString & rShellName, SvSlotElementList & rSlotList, ByteStringList & rList, @@ -119,7 +118,6 @@ protected: sal_Bool bVariable, sal_Bool bWriteTab, SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); -#endif public: SV_DECL_META_FACTORY1( SvMetaClass, SvMetaType, 6 ) SvMetaClass(); @@ -135,7 +133,6 @@ public: GetClassList() const { return aClassList; } -#ifdef IDL_COMPILER virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, @@ -148,7 +145,6 @@ public: Table * pTable ); virtual void WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void WriteHxx( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); -#endif }; SV_IMPL_REF(SvMetaClass) SV_IMPL_PERSIST_LIST(SvMetaClass,SvMetaClass *) diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 69b589f2e827..d7cd8964b83d 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -78,7 +78,6 @@ class SvMetaSlot : public SvMetaAttribute SvMetaEnumValue* pEnumValue; SvString aUnoName; -#ifdef IDL_COMPILER void WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, const ByteString & rSlotId, SvSlotElementList &rList, @@ -91,7 +90,6 @@ class SvMetaSlot : public SvMetaAttribute void SetEnumValue(SvMetaEnumValue *p) { pEnumValue = p; } -#endif protected: void SetCachable( sal_Bool bSet ) { @@ -237,7 +235,6 @@ public: void ResetSlotPointer() { pNextSlot = pLinkedSlot = 0; } -#ifdef IDL_COMPILER SvMetaEnumValue* GetEnumValue() const { return pEnumValue; } virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); @@ -267,7 +264,6 @@ public: virtual void WriteSrc( SvIdlDataBase & rBase, SvStream & rOutStm, Table * pIdTable ); virtual void WriteCSV( SvIdlDataBase&, SvStream& ); -#endif }; SV_DECL_IMPL_REF(SvMetaSlot) SV_DECL_IMPL_PERSIST_LIST(SvMetaSlot,SvMetaSlot *) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 2fe4e2612837..6e8841f4a15d 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -52,7 +52,6 @@ class SvMetaAttribute : public SvMetaReference sal_Bool bNewAttr; protected: -#ifdef IDL_COMPILER virtual void WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm, sal_Bool bSet ); sal_uLong MakeSlotValue( SvIdlDataBase & rBase, sal_Bool bVariable ) const; @@ -63,7 +62,6 @@ protected: SvTokenStream & rInStm ); virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); -#endif public: SV_DECL_META_FACTORY1( SvMetaAttribute, SvMetaReference, 2 ) SvMetaAttribute(); @@ -106,7 +104,6 @@ public: virtual rtl::OString GetMangleName( sal_Bool bVariable ) const; -#ifdef IDL_COMPILER virtual sal_Bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); @@ -127,7 +124,6 @@ public: virtual void WriteCSV( SvIdlDataBase&, SvStream& ); void FillIDTable(Table *pIDTable); ByteString Compare( SvMetaAttribute *pAttr ); -#endif }; SV_IMPL_REF(SvMetaAttribute) SV_IMPL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *) @@ -154,7 +150,6 @@ class SvMetaType : public SvMetaExtern sal_Bool bIsShell; char cParserChar; -#ifdef IDL_COMPILER void WriteSfxItem( const ByteString & rItemName, SvIdlDataBase & rBase, SvStream & rOutStm ); protected: @@ -174,7 +169,6 @@ protected: sal_Bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); void WriteHeaderSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab ); -#endif public: SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 ) SvMetaType(); @@ -228,7 +222,6 @@ public: virtual sal_Bool SetName( const ByteString & rName, SvIdlDataBase * = NULL ); -#ifdef IDL_COMPILER virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); @@ -249,7 +242,6 @@ public: rtl::OString GetParserString() const; void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm, const ByteString & rChief ); -#endif }; SV_IMPL_REF(SvMetaType) SV_DECL_IMPL_PERSIST_LIST(SvMetaType,SvMetaType *) @@ -272,12 +264,10 @@ public: SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 ) SvMetaEnumValue(); -#ifdef IDL_COMPILER virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0 ); -#endif }; SV_DECL_IMPL_REF(SvMetaEnumValue) SV_DECL_IMPL_PERSIST_LIST(SvMetaEnumValue,SvMetaEnumValue *) @@ -288,13 +278,11 @@ class SvMetaTypeEnum : public SvMetaType SvMetaEnumValueMemberList aEnumValueList; ByteString aPrefix; protected: -#ifdef IDL_COMPILER virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16 nTab ); virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0 ); -#endif public: SV_DECL_META_FACTORY1( SvMetaTypeEnum, SvMetaType, 21 ) SvMetaTypeEnum(); @@ -305,14 +293,12 @@ public: SvMetaEnumValue * GetObject( sal_uLong n ) const { return aEnumValueList.GetObject( n ); } -#ifdef IDL_COMPILER virtual sal_Bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); virtual void WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ); virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0 ); -#endif }; SV_DECL_IMPL_REF(SvMetaTypeEnum) SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeEnum,SvMetaTypeEnum *) 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: */ |