5th step to remove tools/rtti.hxx

tools/rtti.hxx removed
completed the interface of some Sdr.*  Items
and removed pseudo items

Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a
Reviewed-on: https://gerrit.libreoffice.org/19837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>

10 files changed, 4 insertions, 28 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 4fd69d7cdb4f..1d6c70a103e3 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -100,7 +100,6 @@ protected:
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm );
 public:
-            TYPEINFO_OVERRIDE();
             SvMetaObject();
 
     static void         WriteTab( SvStream & rOutStm, sal_uInt16 nTab );
@@ -147,7 +146,6 @@ class SvMetaReference : public SvMetaObject
 protected:
     tools::SvRef<SvMetaReference>  aRef;
 public:
-            TYPEINFO_OVERRIDE();
             SvMetaReference();
 
     const SvString &    GetName() const override
@@ -199,7 +197,6 @@ class SvMetaExtern : public SvMetaReference
     bool                    bReadUUId;
     bool                    bReadVersion;
 public:
-                        TYPEINFO_OVERRIDE();
                         SvMetaExtern();
 
     SvMetaModule *      GetModule() const;
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 3855699c5f50..12b4b4af17b4 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -52,7 +52,6 @@ protected:
     virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
     virtual void        ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
 public:
-                        TYPEINFO_OVERRIDE();
 
     virtual bool        SetName( const OString& rName, SvIdlDataBase * = nullptr  ) override;
 
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 1ba006635121..28502888da6f 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -46,7 +46,6 @@ class SvClassElement : public SvRttiBase
     OString                aPrefix;
     SvMetaClassRef              xClass;
 public:
-            TYPEINFO_OVERRIDE();
             SvClassElement();
 
     void            SetPrefix( const OString& rPrefix )
@@ -98,7 +97,6 @@ protected:
     virtual void    ReadContextSvIdl( SvIdlDataBase &,
                                      SvTokenStream & rInStm ) override;
 public:
-            TYPEINFO_OVERRIDE();
             SvMetaClass();
 
     void                FillClasses( SvMetaClassList & rList );
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index e24f937a770c..8ed5d398d2bf 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -146,7 +146,6 @@ protected:
             }
 
 public:
-            TYPEINFO_OVERRIDE();
             SvMetaObject *  MakeClone() const;
             SvMetaSlot *Clone() const { return static_cast<SvMetaSlot *>(MakeClone()); }
 
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 869a45f97e23..fee2a5a8df55 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -48,7 +48,6 @@ protected:
     virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm ) override;
 public:
-            TYPEINFO_OVERRIDE();
                         SvMetaAttribute();
                         SvMetaAttribute( SvMetaType * );
 
@@ -113,7 +112,6 @@ protected:
 
     bool    ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
 public:
-            TYPEINFO_OVERRIDE();
             SvMetaType();
             SvMetaType( const OString& rTypeName, char cParserChar,
                                 const OString& rCName );
@@ -176,7 +174,6 @@ class SvMetaTypeMemberList : public SvRefMemberList<SvMetaType *> {};
 class SvMetaTypeString : public SvMetaType
 {
 public:
-            TYPEINFO_OVERRIDE();
             SvMetaTypeString();
 };
 
@@ -185,7 +182,6 @@ class SvMetaTypeStringMemberList : public SvRefMemberList<SvMetaTypeString *> {}
 class SvMetaEnumValue : public SvMetaObject
 {
 public:
-    TYPEINFO_OVERRIDE();
     SvMetaEnumValue();
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
@@ -200,7 +196,6 @@ class SvMetaTypeEnum : public SvMetaType
 protected:
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
 public:
-            TYPEINFO_OVERRIDE();
             SvMetaTypeEnum();
 
     sal_uLong           Count() const { return aEnumValueList.size(); }
@@ -216,7 +211,6 @@ class SvMetaTypeEnumMemberList : public SvRefMemberList<SvMetaTypeEnum *> {};
 class SvMetaTypevoid : public SvMetaType
 {
 public:
-            TYPEINFO_OVERRIDE();
             SvMetaTypevoid();
 };
 class SvMetaTypevoidMemberList : public SvRefMemberList<SvMetaTypevoid *> {};
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 332341da3a2e..4af4327f3e8e 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -62,7 +62,6 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
         rOutStm.Seek( nPos );
 }
 
-TYPEINIT1( SvMetaObject, SvRttiBase );
 SvMetaObject::SvMetaObject()
 {
 }
@@ -158,13 +157,11 @@ bool SvMetaObject::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
     return bOk;
 }
 
-TYPEINIT1( SvMetaReference, SvMetaObject );
 
 SvMetaReference::SvMetaReference()
 {
 }
 
-TYPEINIT1( SvMetaExtern, SvMetaReference );
 
 SvMetaExtern::SvMetaExtern()
     : pModule( nullptr )
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index f78390eab8df..0109211adec9 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -27,7 +27,6 @@
 #include <tools/debug.hxx>
 #include <osl/file.hxx>
 
-TYPEINIT1( SvMetaModule, SvMetaExtern );
 
 SvMetaModule::SvMetaModule( bool bImp )
     : bImported( bImp ), bIsModified( false )
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 218504f18487..3172e86e5b39 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -28,13 +28,11 @@
 #include <globals.hxx>
 #include <database.hxx>
 
-TYPEINIT1( SvClassElement, SvPersistBase );
 
 SvClassElement::SvClassElement()
 {
 };
 
-TYPEINIT1( SvMetaClass, SvMetaType );
 SvMetaClass::SvMetaClass()
     : aAutomation( true, false )
 {
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index f0176db98b63..6d8157b2506a 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -27,7 +27,6 @@
 #include <globals.hxx>
 #include <database.hxx>
 
-TYPEINIT1( SvMetaSlot, SvMetaAttribute );
 
 SvMetaObject *SvMetaSlot::MakeClone() const
 {
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index fd7b0806fd2d..f683458790d9 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -27,7 +27,6 @@
 #include <globals.hxx>
 #include <database.hxx>
 
-TYPEINIT1( SvMetaAttribute, SvMetaReference );
 SvMetaAttribute::SvMetaAttribute()
     : aAutomation( true, false )
     , aExport( true, false )
@@ -220,7 +219,6 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&
 {
 }
 
-TYPEINIT1( SvMetaType, SvMetaExtern );
 #define CTOR                            \
     : aCall0( CALL_VALUE, false )       \
     , aCall1( CALL_VALUE, false )       \
@@ -592,8 +590,10 @@ void SvMetaType::WriteSfxItem(
     rOutStm.WriteCharPtr( aTypeName.getStr() ).WriteCharPtr( aVarName.getStr() )
            .WriteCharPtr( " = " ) << endl;
     rOutStm.WriteChar( '{' ) << endl;
-    rOutStm.WriteCharPtr( "\tTYPE(" ).WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " )
-           .WriteCharPtr( aAttrCount.getStr() );
+
+    rOutStm.WriteCharPtr( "\tcreateSfxPoolItem<" ).WriteCharPtr( rItemName.getStr() )
+        .WriteCharPtr(">, &typeid(").WriteCharPtr( rItemName.getStr() ).WriteCharPtr( "), " );
+    rOutStm.WriteCharPtr( aAttrCount.getStr() );
     if( nAttrCount )
     {
         rOutStm.WriteCharPtr( ", { " );
@@ -658,13 +658,11 @@ OString SvMetaType::GetParserString() const
     return aPStr;
 }
 
-TYPEINIT1( SvMetaTypeString, SvMetaType );
 SvMetaTypeString::SvMetaTypeString()
     : SvMetaType( "String", "SbxSTRING", "BSTR", 's', "char *", "String", "$" )
 {
 }
 
-TYPEINIT1( SvMetaEnumValue, SvMetaObject );
 SvMetaEnumValue::SvMetaEnumValue()
 {
 }
@@ -677,7 +675,6 @@ bool SvMetaEnumValue::ReadSvIdl( SvIdlDataBase & rBase,
     return true;
 }
 
-TYPEINIT1( SvMetaTypeEnum, SvMetaType );
 SvMetaTypeEnum::SvMetaTypeEnum()
 {
     SetBasicName("Integer");
@@ -737,7 +734,6 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
     return false;
 }
 
-TYPEINIT1( SvMetaTypevoid, SvMetaType );
 SvMetaTypevoid::SvMetaTypevoid()
     : SvMetaType( "void", "SbxVOID", "void", 'v', "void", "", "" )
 {