IDL_COMPILER is always defined

8 files changed, 0 insertions, 61 deletions

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 *)