Strip svidl down to what is still used

...the generated .ilb, .lst, and .sid outputs requested by SdiTarget were
apparently unused.

Change-Id: I1abb2abc7945070451fce4a98a11d955515e3f63

9 files changed, 34 insertions, 114 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 34d0b100e069..5c0ac112565e 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -38,8 +38,7 @@ typedef SvMetaObject * (*CreateMetaObjectType)();
 
 enum WriteType
 {
-    WRITE_IDL, WRITE_ODL, WRITE_SLOTMAP, WRITE_C_HEADER, WRITE_C_SOURCE,
-    WRITE_CXX_HEADER, WRITE_CXX_SOURCE, WRITE_DOCU
+    WRITE_C_HEADER, WRITE_C_SOURCE
 };
 
 enum
@@ -49,16 +48,10 @@ enum
 };
 typedef int WriteAttribute;
 
-#define SV_DECL_META_FACTORY1( Class, Super1, CLASS_ID )                \
-    SV_DECL_PERSIST1( Class, Super1, CLASS_ID )
-
-#define SV_IMPL_META_FACTORY1( Class, Super1 )                          \
-    SV_IMPL_PERSIST1( Class, Super1 )
-
-class SvMetaObject : public SvPersistBase
+class SvMetaObject : public SvRttiBase
 {
 public:
-            SV_DECL_META_FACTORY1( SvMetaObject, SvPersistBase, 14 )
+            TYPEINFO_OVERRIDE();
             SvMetaObject();
 
     static void         WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
@@ -67,14 +60,16 @@ public:
     static void         WriteStars( SvStream & );
 
     virtual 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 );
+
+protected:
+    virtual ~SvMetaObject() {}
 };
 typedef tools::SvRef<SvMetaObject> SvMetaObjectRef;
 
-class SvMetaObjectMemberList : public SvDeclPersistList<SvMetaObject *> {};
+class SvMetaObjectMemberList : public SvRefMemberList<SvMetaObject *> {};
 
 class SvMetaObjectMemberStack
 {
@@ -111,18 +106,14 @@ protected:
             void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm,
                                      char c = '\0' );
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    virtual void WriteContextSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, sal_uInt16 nTab );
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
-    virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                       SvStream & rOutStm, sal_uInt16 nTab );
     virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0);
     virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                         WriteType, WriteAttribute = 0);
 public:
-            SV_DECL_META_FACTORY1( SvMetaName, SvMetaObject, 15 )
+            TYPEINFO_OVERRIDE();
             SvMetaName();
 
     virtual bool                SetName( const OString& rName, SvIdlDataBase * = NULL  );
@@ -136,14 +127,13 @@ public:
 
     virtual bool        Test( SvIdlDataBase &, SvTokenStream & rInStm );
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                        WriteType, WriteAttribute = 0) SAL_OVERRIDE;
     void                WriteDescription( SvStream& rOutStm );
 };
 typedef tools::SvRef<SvMetaName> SvMetaNameRef;
 
-class SvMetaNameMemberList : public SvDeclPersistList<SvMetaName *> {};
+class SvMetaNameMemberList : public SvRefMemberList<SvMetaName *> {};
 
 class SvMetaReference;
 typedef tools::SvRef<SvMetaReference> SvMetaReferenceRef;
@@ -152,7 +142,7 @@ class SvMetaReference : public SvMetaName
 protected:
     SvMetaReferenceRef  aRef;
 public:
-            SV_DECL_META_FACTORY1( SvMetaReference, SvMetaName, 17 )
+            TYPEINFO_OVERRIDE();
             SvMetaReference();
 
     const SvString &    GetName() const SAL_OVERRIDE
@@ -191,7 +181,7 @@ public:
                         { aRef = pRef; }
 };
 
-class SvMetaReferenceMemberList : public SvDeclPersistList<SvMetaReference *> {};
+class SvMetaReferenceMemberList : public SvRefMemberList<SvMetaReference *> {};
 
 
 class SvMetaModule;
@@ -204,7 +194,7 @@ class SvMetaExtern : public SvMetaReference
     bool                    bReadUUId;
     bool                    bReadVersion;
 public:
-                        SV_DECL_META_FACTORY1( SvMetaExtern, SvMetaName, 16 )
+                        TYPEINFO_OVERRIDE();
                         SvMetaExtern();
 
     SvMetaModule *      GetModule() const;
@@ -213,20 +203,17 @@ public:
     const SvVersion &   GetVersion() const { return aVersion; }
     void                SetModule( SvIdlDataBase & rBase );
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
 
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0) SAL_OVERRIDE;
 protected:
     virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                              SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void        WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                           WriteType, WriteAttribute = 0) SAL_OVERRIDE;
 };
 typedef tools::SvRef<SvMetaExtern> SvMetaExternRef;
 
-class SvMetaExternMemberList : public SvDeclPersistList<SvMetaExtern *> {};
+class SvMetaExternMemberList : public SvRefMemberList<SvMetaExtern *> {};
 
 #endif // INCLUDED_IDL_INC_BASOBJ_HXX
 
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 588f091ef532..1d862843944c 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -90,7 +90,6 @@ public:
     friend SvStream& operator >> (SvStream &, SvBOOL &);
 
     bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm );
     OString    GetSvIdlString( SvStringHashEntry * pName );
 };
 
@@ -119,8 +118,6 @@ public:
         return !m_aStr.isEmpty();
     }
     bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
-                            sal_uInt16 nTab );
 };
 
 
@@ -168,8 +165,6 @@ public:
     friend SvStream& operator >> (SvStream &, SvString &);
 
     bool        ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm );
-    bool        WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
-                            sal_uInt16 nTab );
 };
 
 
@@ -178,8 +173,6 @@ class SvHelpText : public SvString
 public:
                 SvHelpText() {}
     bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    bool        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
-                            sal_uInt16 nTab );
 };
 
 
@@ -192,7 +185,6 @@ class SvUUId : public SvGlobalName
 public:
                 SvUUId() {}
     bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    bool        WriteSvIdl( SvStream & rOutStm );
 };
 
 
@@ -218,7 +210,6 @@ public:
     friend SvStream& WriteSvVersion(SvStream &, const SvVersion &);
     friend SvStream& operator >> (SvStream &, SvVersion &);
     bool        ReadSvIdl( SvTokenStream & rInStm );
-    bool        WriteSvIdl( SvStream & rOutStm );
 };
 
 
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 3f47ad87bcb7..04c5ea08d613 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -29,20 +29,13 @@ typedef ::std::vector< OString* > ByteStringList;
 class SvCommand
 {
 public:
-    OUString    aDataBaseFile;
     StringList  aInFileList;
-    OUString    aListFile;
     OUString    aSlotMapFile;
-    OUString    aSfxItemFile;
     OUString    aPath;
     OUString    aTargetFile;
-    OUString    aHelpIdFile;
-    OUString    aCSVFile;
     OUString    aExportFile;
-    OUString    aDocuFile;
     OUString    m_DepFile;
     sal_uInt32      nVerbosity;
-    sal_uInt32      nFlags;
 
                 SvCommand( int argc, char ** argv );
                 ~SvCommand();
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 07de1c20ea7a..95a271c4dcbf 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -59,7 +59,6 @@ class SvIdlDataBase
     OUString                    aExportFile;
     sal_uInt32                  nUniqueId;
     sal_uInt32                  nVerbosity;
-    SvPersistStream             aPersStream;
     StringList                  aIdFileList;
     SvStringHashTable *         pIdTable;
 
@@ -84,10 +83,6 @@ public:
 
                 explicit SvIdlDataBase( const SvCommand& rCmd );
                 ~SvIdlDataBase();
-    static bool IsBinaryFormat( SvStream & rInStm );
-
-    void        Load( SvStream & rInStm );
-    void        Save( SvStream & rInStm, sal_uInt32 nContextFlags );
 
     SvMetaAttributeMemberList&  GetAttrList() { return aAttrList; }
     SvStringHashTable *       GetIdTable() { return pIdTable; }
@@ -152,13 +147,8 @@ public:
                 explicit SvIdlWorkingBase( const SvCommand& rCmd );
 
     bool        ReadSvIdl( SvTokenStream &, bool bImported, const OUString & rPath );
-    bool        WriteSvIdl( SvStream & );
 
     bool        WriteSfx( SvStream & );
-    bool        WriteHelpIds( SvStream & );
-    bool        WriteSfxItem( SvStream & );
-    bool        WriteCSV( SvStream& );
-    bool        WriteDocumentation( SvStream& );
 };
 
 #endif // INCLUDED_IDL_INC_DATABASE_HXX
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 7143f2a605e5..3569d975018f 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -119,7 +119,6 @@ class IdlDll
 {
 public:
     SvStringHashTable * pHashTable;
-    SvClassManager    * pClassMgr;
     SvGlobalHashNames * pGlobalNames;
 
                 IdlDll();
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 848fe590470c..d37a86fb2183 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -51,11 +51,9 @@ class SvMetaModule : public SvMetaExtern
     SvGlobalName            aNextName;
 protected:
     virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void        ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteContextSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
 public:
-                        SV_DECL_META_FACTORY1( SvMetaModule, SvMetaExtern, 13 )
+                        TYPEINFO_OVERRIDE();
                         SvMetaModule();
 
     const OUString &    GetIdlFileName() const { return aIdlFileName; }
@@ -78,7 +76,6 @@ public:
     bool                IsModified() const { return bIsModified; }
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
 
     virtual void        WriteAttributes( SvIdlDataBase & rBase,
                                         SvStream & rOutStm, sal_uInt16 nTab,
@@ -86,12 +83,10 @@ public:
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                     WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
-    virtual void        WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                    HelpIdTable& rTable );
 };
 typedef tools::SvRef<SvMetaModule> SvMetaModuleRef;
 
-class SvMetaModuleMemberList : public SvDeclPersistList<SvMetaModule *> {};
+class SvMetaModuleMemberList : public SvRefMemberList<SvMetaModule *> {};
 
 
 #endif // INCLUDED_IDL_INC_MODULE_HXX
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 1e1037c29281..01ac607b2e4c 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -40,13 +40,13 @@ class SvMetaClass;
 typedef ::std::vector< SvMetaClass* > SvMetaClassList;
 
 typedef tools::SvRef<SvMetaClass> SvMetaClassRef;
-class SvClassElement : public SvPersistBase
+class SvClassElement : public SvRttiBase
 {
     SvBOOL                      aAutomation;
     OString                aPrefix;
     SvMetaClassRef              xClass;
 public:
-            SV_DECL_PERSIST1( SvClassElement, SvPersistBase, 1 )
+            TYPEINFO_OVERRIDE();
             SvClassElement();
 
     void            SetPrefix( const OString& rPrefix )
@@ -67,9 +67,9 @@ public:
 
 typedef tools::SvRef<SvClassElement> SvClassElementRef;
 
-class SvClassElementMemberList : public SvDeclPersistList<SvClassElement *> {};
+class SvClassElementMemberList : public SvRefMemberList<SvClassElement *> {};
 
-class SvMetaClassMemberList : public SvDeclPersistList<SvMetaClass *> {};
+class SvMetaClassMemberList : public SvRefMemberList<SvMetaClass *> {};
 
 class SvMetaClass : public SvMetaType
 {
@@ -100,18 +100,14 @@ class SvMetaClass : public SvMetaType
 protected:
     virtual void    ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void    WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void    ReadContextSvIdl( SvIdlDataBase &,
                                      SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void    WriteContextSvIdl( SvIdlDataBase & rBase,
-                                     SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     void            WriteOdlMembers( ByteStringList & rSuperList,
                                     bool bVariable, bool bWriteTab,
                                     SvIdlDataBase & rBase,
                                     SvStream & rOutStm, sal_uInt16 nTab );
 public:
-            SV_DECL_META_FACTORY1( SvMetaClass, SvMetaType, 6 )
+            TYPEINFO_OVERRIDE();
             SvMetaClass();
 
     bool                GetAutomation() const
@@ -126,13 +122,10 @@ public:
                         { return aClassList; }
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                                  sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
     virtual void        WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ) SAL_OVERRIDE;
-    virtual void        WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                HelpIdTable& rTable );
 };
 
 #endif // INCLUDED_IDL_INC_OBJECT_HXX
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index db16bfd96062..01ba419f7292 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -167,7 +167,7 @@ protected:
             { aImageReflection = bSet; }
 
 public:
-            SV_DECL_META_FACTORY1( SvMetaSlot, SvMetaReference, 11 )
+            TYPEINFO_OVERRIDE();
             SvMetaObject *  MakeClone() const;
             SvMetaSlot *Clone() const { return static_cast<SvMetaSlot *>(MakeClone()); }
 
@@ -229,11 +229,7 @@ public:
     virtual bool        Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
     virtual void        ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                              SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                              SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void        Insert( SvSlotElementList&, const OString& rPrefix,
                                 SvIdlDataBase& ) SAL_OVERRIDE;
     void                WriteSlotStubs( const OString& rShellName,
@@ -247,13 +243,10 @@ public:
                                     SvStream & rOutStm );
     sal_uInt16          WriteSlotParamArray( SvIdlDataBase & rBase,
                                             SvStream & rOutStm );
-    virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                  HelpIdTable& rIdTable ) SAL_OVERRIDE;
-    virtual void        WriteCSV( SvIdlDataBase&, SvStream& ) SAL_OVERRIDE;
 };
 typedef tools::SvRef<SvMetaSlot> SvMetaSlotRef;
 
-class SvMetaSlotMemberList : public SvDeclPersistList<SvMetaSlot *> {};
+class SvMetaSlotMemberList : public SvRefMemberList<SvMetaSlot *> {};
 
 #endif // INCLUDED_IDL_INC_SLOT_HXX
 
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 54f2c1a88686..a73964bb4619 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -23,13 +23,11 @@
 #include <rtl/strbuf.hxx>
 #include <tools/ref.hxx>
 #include <basobj.hxx>
-#include <map>
 
 struct SvSlotElement;
 typedef std::vector< SvSlotElement* > SvSlotElementList;
 
 class SvMetaSlot;
-typedef std::map<sal_uLong, SvMetaSlot*> HelpIdTable;
 
 class SvMetaType;
 typedef tools::SvRef<SvMetaType> SvMetaTypeRef;
@@ -55,10 +53,8 @@ protected:
                                         WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
 public:
-            SV_DECL_META_FACTORY1( SvMetaAttribute, SvMetaReference, 2 )
+            TYPEINFO_OVERRIDE();
                         SvMetaAttribute();
                         SvMetaAttribute( SvMetaType * );
 
@@ -101,7 +97,6 @@ public:
 
     virtual bool        Test( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void        WriteParam( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                     WriteType );
     void                WriteRecursiv_Impl( SvIdlDataBase & rBase,
@@ -112,16 +107,12 @@ public:
     sal_uLong           MakeSfx( OStringBuffer& rAtrrArray );
     virtual void        Insert( SvSlotElementList&, const OString& rPrefix,
                                 SvIdlDataBase& );
-    virtual void        WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm,
-                                  HelpIdTable& rIdTable );
-    virtual void        WriteCSV( SvIdlDataBase&, SvStream& );
-    void                FillIDTable(HelpIdTable& rIDTable);
     OString        Compare( SvMetaAttribute *pAttr );
 };
 
 typedef tools::SvRef<SvMetaAttribute> SvMetaAttributeRef;
 
-class SvMetaAttributeMemberList : public SvDeclPersistList<SvMetaAttribute *> {};
+class SvMetaAttributeMemberList : public SvRefMemberList<SvMetaAttribute *> {};
 
 enum { CALL_VALUE, CALL_POINTER, CALL_REFERENCE };
 enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM, TYPE_UNION,
@@ -150,10 +141,7 @@ protected:
     bool        ReadNamesSvIdl( SvIdlDataBase & rBase,
                                          SvTokenStream & rInStm );
     virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void WriteAttributesSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                                   sal_uInt16 nTab ) SAL_OVERRIDE;
 
     virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
                                       sal_uInt16 nTab,
@@ -161,10 +149,8 @@ protected:
     virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
     bool    ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-    void    WriteHeaderSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                              sal_uInt16 nTab );
 public:
-            SV_DECL_META_FACTORY1( SvMetaType, SvMetaExtern, 18 )
+            TYPEINFO_OVERRIDE();
             SvMetaType();
             SvMetaType( const OString& rTypeName, char cParserChar,
                                 const OString& rCName );
@@ -219,8 +205,6 @@ public:
 
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase,
-                                    SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
     OString             GetCString() const;
@@ -239,33 +223,31 @@ public:
                                         const OString& rChief );
 };
 
-class SvMetaTypeMemberList : public SvDeclPersistList<SvMetaType *> {};
+class SvMetaTypeMemberList : public SvRefMemberList<SvMetaType *> {};
 
 class SvMetaTypeString : public SvMetaType
 {
 public:
-            SV_DECL_META_FACTORY1( SvMetaTypeString, SvMetaType, 19 )
+            TYPEINFO_OVERRIDE();
             SvMetaTypeString();
 };
 typedef tools::SvRef<SvMetaTypeString> SvMetaTypeStringRef;
 
-class SvMetaTypeStringMemberList : public SvDeclPersistList<SvMetaTypeString *> {};
+class SvMetaTypeStringMemberList : public SvRefMemberList<SvMetaTypeString *> {};
 
 class SvMetaEnumValue : public SvMetaName
 {
-    OString aEnumValue;
 public:
-    SV_DECL_META_FACTORY1( SvMetaEnumValue, SvMetaName, 20 )
+    TYPEINFO_OVERRIDE();
     SvMetaEnumValue();
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
 };
 typedef tools::SvRef<SvMetaEnumValue> SvMetaEnumValueRef;
 
-class SvMetaEnumValueMemberList : public SvDeclPersistList<SvMetaEnumValue *> {};
+class SvMetaEnumValueMemberList : public SvRefMemberList<SvMetaEnumValue *> {};
 
 class SvMetaTypeEnum : public SvMetaType
 {
@@ -273,12 +255,10 @@ class SvMetaTypeEnum : public SvMetaType
     OString aPrefix;
 protected:
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void WriteContextSvIdl( SvIdlDataBase &, SvStream & rOutStm,
-                                   sal_uInt16 nTab ) SAL_OVERRIDE;
     virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab,
                                   WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
 public:
-            SV_DECL_META_FACTORY1( SvMetaTypeEnum, SvMetaType, 21 )
+            TYPEINFO_OVERRIDE();
             SvMetaTypeEnum();
 
     sal_uInt16          GetMaxValue() const;
@@ -288,7 +268,6 @@ public:
                         { return aEnumValueList[n]; }
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE;
-    virtual void        WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab ) SAL_OVERRIDE;
 
     virtual void        Write( SvIdlDataBase & rBase, SvStream & rOutStm,
                                 sal_uInt16 nTab,
@@ -296,16 +275,16 @@ public:
 };
 typedef tools::SvRef<SvMetaTypeEnum> SvMetaTypeEnumRef;
 
-class SvMetaTypeEnumMemberList : public SvDeclPersistList<SvMetaTypeEnum *> {};
+class SvMetaTypeEnumMemberList : public SvRefMemberList<SvMetaTypeEnum *> {};
 
 class SvMetaTypevoid : public SvMetaType
 {
 public:
-            SV_DECL_META_FACTORY1( SvMetaTypevoid, SvMetaName, 22 )
+            TYPEINFO_OVERRIDE();
             SvMetaTypevoid();
 };
 typedef tools::SvRef<SvMetaTypevoid> SvMetaTypevoidRef;
-class SvMetaTypevoidMemberList : public SvDeclPersistList<SvMetaTypevoid *> {};
+class SvMetaTypevoidMemberList : public SvRefMemberList<SvMetaTypevoid *> {};
 
 
 #endif // INCLUDED_IDL_INC_TYPES_HXX