SvMetaReference currently serves no purpose

Change-Id: I676e61fee201b1a2e7f66b541061de2b049bffa9

6 files changed, 5 insertions, 37 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 5524df033f40..6db8ca00a9eb 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -158,19 +158,6 @@ public:
                         { aRef = pRef; }
 };
 
-class SvMetaModule;
-class SvMetaExtern : public SvMetaReference
-{
-    SvMetaModule *          pModule;    // included in which module
-
-public:
-                        SvMetaExtern();
-
-    void                SetModule( SvIdlDataBase & rBase );
-    virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
-};
-
-
 #endif // INCLUDED_IDL_INC_BASOBJ_HXX
 
 
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 3a052641f5ee..2a64c63e64ac 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -23,7 +23,7 @@
 #include <slot.hxx>
 #include <object.hxx>
 
-class SvMetaModule : public SvMetaExtern
+class SvMetaModule : public SvMetaReference
 {
     SvRefMemberList<SvMetaClass *>      aClassList;
     SvRefMemberList<SvMetaType *>       aTypeList;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 2356f5dc6e43..57d3ecf34fbd 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -67,7 +67,7 @@ public:
 
 enum MetaTypeType { Method, Struct, Base, Enum, Class };
 
-class SvMetaType : public SvMetaExtern
+class SvMetaType : public SvMetaReference
 {
     SvIdentifier                aBasicPostfix;
     SvRefMemberList<SvMetaAttribute *>* pAttrList;
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index a9ddcf8de4e7..8bc07bd2499e 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -150,20 +150,4 @@ SvMetaReference::SvMetaReference()
 }
 
 
-SvMetaExtern::SvMetaExtern()
-    : pModule( nullptr )
-{
-}
-
-void SvMetaExtern::SetModule( SvIdlDataBase & rBase )
-{
-    pModule = static_cast<SvMetaModule *>(rBase.GetStack().Get( checkSvMetaObject<SvMetaModule> ));
-}
-
-bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
-{
-    SetModule( rBase );
-    return SvMetaReference::ReadSvIdl( rBase, rInStm );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index c4d510d89249..56cad71459af 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -36,7 +36,7 @@ SvMetaModule::SvMetaModule( bool bImp )
 void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                         SvTokenStream & rInStm )
 {
-    SvMetaExtern::ReadAttributesSvIdl( rBase, rInStm );
+    SvMetaReference::ReadAttributesSvIdl( rBase, rInStm );
 
     if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) )
     {
@@ -195,7 +195,6 @@ bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
         if( ReadNameSvIdl( rInStm ) )
         {
             // set pointer to itself
-            SetModule( rBase );
             bOk = SvMetaObject::ReadSvIdl( rBase, rInStm );
         }
         rBase.GetStack().Pop(); // remove from stack
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 84371cb0558d..aea5f1f6c3b0 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -279,9 +279,7 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
             rBase.WriteError( rInStm );
         }
     }
-    if( bOk )
-        SetModule( rBase );
-    else
+    if( !bOk )
         rInStm.Seek( nTokPos );
     return bOk;
 }
@@ -292,7 +290,7 @@ bool SvMetaType::ReadSvIdl( SvIdlDataBase & rBase,
     if( ReadHeaderSvIdl( rBase, rInStm ) )
     {
         rBase.Write(OString('.'));
-        return SvMetaExtern::ReadSvIdl( rBase, rInStm );
+        return SvMetaReference::ReadSvIdl( rBase, rInStm );
     }
     return false;
 }