remove unused OdlName from .SDI files

Change-Id: I1ce7de74b9cb9a2cebbacf8d81c0ca9164a1596a

5 files changed, 20 insertions, 39 deletions

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index dcb32ac17ddc..7da64bba940c 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -69,7 +69,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_SvName;
     SvStringHashEntryRef MM_SbxName;
     SvStringHashEntryRef MM_ItemName;
-    SvStringHashEntryRef MM_OdlName;
     SvStringHashEntryRef MM_include;
     SvStringHashEntryRef MM_ExecMethod;
     SvStringHashEntryRef MM_StateMethod;
@@ -155,7 +154,6 @@ HASH_INLINE(import)
 HASH_INLINE(SlotIdFile)
 HASH_INLINE(SvName)
 HASH_INLINE(SbxName)
-HASH_INLINE(OdlName)
 HASH_INLINE(include)
 HASH_INLINE(ExecMethod)
 HASH_INLINE(StateMethod)
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 69e3928822fa..ff3658433b84 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -84,7 +84,6 @@ class SvMetaType : public SvMetaExtern
     Svint                       aCall0, aCall1;
     SvIdentifier                aSvName;
     SvIdentifier                aSbxName;
-    SvIdentifier                aOdlName;
     SvIdentifier                aCName;
     SvIdentifier                aBasicPostfix;
     SvIdentifier                aBasicName;
@@ -108,7 +107,7 @@ public:
             SvMetaType( const OString& rTypeName, char cParserChar,
                                 const OString& rCName );
             SvMetaType( const OString& rTypeName, const OString& rSbxName,
-                        const OString& rOdlName, char cParserChar,
+                        char cParserChar,
                         const OString& rCName, const OString& rBasicName,
                         const OString& rBasicPostfix );
 
@@ -142,11 +141,10 @@ public:
     void                SetBasicName(const OString& rName)
                         { aBasicName.setString(rName); }
 
-    const OString& GetBasicName() const;
-    const OString& GetSvName() const;
-    const OString& GetSbxName() const;
-    const OString& GetOdlName() const;
-    const OString& GetCName() const;
+    const OString&      GetBasicName() const;
+    const OString&      GetSvName() const;
+    const OString&      GetSbxName() const;
+    const OString&      GetCName() const;
     char                GetParserChar() const { return cParserChar; }
 
     virtual bool        SetName( const OString& rName, SvIdlDataBase * = nullptr ) override;
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 8249cf14df78..ed5275ecc8a1 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -209,7 +209,6 @@ SvMetaType::SvMetaType( const OString& rName, char cPC,
 
 SvMetaType::SvMetaType( const OString& rName,
                         const OString& rSbxName,
-                        const OString& rOdlName,
                         char cPc,
                         const OString& rCName,
                         const OString& rBasicName,
@@ -218,7 +217,6 @@ SvMetaType::SvMetaType( const OString& rName,
 {
     SetName( rName );
     aSbxName.setString(rSbxName);
-    aOdlName.setString(rOdlName);
     cParserChar = cPc;
     aCName.setString(rCName);
     aBasicName.setString(rBasicName);
@@ -241,7 +239,6 @@ void SvMetaType::SetType( int nT )
     nType = nT;
     if( nType == TYPE_ENUM )
     {
-        aOdlName.setString("short");
     }
     else if( nType == TYPE_CLASS )
     {
@@ -353,14 +350,6 @@ const OString& SvMetaType::GetSbxName() const
         return static_cast<SvMetaType *>(GetRef())->GetSbxName();
 }
 
-const OString& SvMetaType::GetOdlName() const
-{
-    if( aOdlName.IsSet() || !GetRef() )
-        return aOdlName.getString();
-    else
-        return static_cast<SvMetaType *>(GetRef())->GetOdlName();
-}
-
 const OString& SvMetaType::GetCName() const
 {
     if( aCName.IsSet() || !GetRef() )
@@ -374,8 +363,6 @@ bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase )
     aSvName.setString(rName);
     aSbxName.setString(rName);
     aCName.setString(rName);
-    if( GetType() != TYPE_ENUM )
-        aOdlName.setString(rName);
     return SvMetaReference::SetName( rName, pBase );
 }
 
@@ -477,7 +464,6 @@ void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     SvMetaExtern::ReadAttributesSvIdl( rBase, rInStm );
     aSvName.ReadSvIdl( SvHash_SvName(), rInStm );
     aSbxName.ReadSvIdl( SvHash_SbxName(), rInStm );
-    aOdlName.ReadSvIdl( SvHash_OdlName(), rInStm );
 }
 
 void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase,
@@ -623,7 +609,7 @@ OString SvMetaType::GetParserString() const
 }
 
 SvMetaTypeString::SvMetaTypeString()
-    : SvMetaType( "String", "SbxSTRING", "BSTR", 's', "char *", "String", "$" )
+    : SvMetaType( "String", "SbxSTRING", 's', "char *", "String", "$" )
 {
 }
 
@@ -699,7 +685,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
 }
 
 SvMetaTypevoid::SvMetaTypevoid()
-    : SvMetaType( "void", "SbxVOID", "void", 'v', "void", "", "" )
+    : SvMetaType( "void", "SbxVOID", 'v', "void", "", "" )
 {
 }
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 33c2a4d06ed8..10682cf7599a 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -45,9 +45,9 @@ SvIdlDataBase::~SvIdlDataBase()
     delete pIdTable;
 }
 
-#define ADD_TYPE( Name, OdlName, ParserChar, CName, BasName, BasPost )            \
+#define ADD_TYPE( Name, ParserChar, CName, BasName, BasPost )            \
     aTypeList.push_back( new SvMetaType( SvHash_##Name()->GetName(),   \
-                     BasName, OdlName, ParserChar, CName, BasName, BasPost ) );
+                     BasName, ParserChar, CName, BasName, BasPost ) );
 
 SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
 {
@@ -57,17 +57,17 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
         aTypeList.push_back( new SvMetaTypevoid() );
 
         // MI: IDispatch::Invoke can not unsigned
-        ADD_TYPE( UINT16,    "long", 'h', "unsigned short", "Long", "&" );
-        ADD_TYPE( INT16,     "short", 'h', "short", "Integer", "%" );
-        ADD_TYPE( UINT32,    "long", 'l', "unsigned long", "Long", "&" );
-        ADD_TYPE( INT32,     "long", 'l', "long", "Long", "&" );
-        ADD_TYPE( int,       "int", 'i', "int", "Integer", "%" );
-        ADD_TYPE( BOOL,      "boolean", 'b', "unsigned char", "Boolean", "" );
-        ADD_TYPE( char,      "char", 'c', "char", "Integer", "%" );
-        ADD_TYPE( BYTE,      "char", 'c', "unsigned char", "Integer", "%" );
-        ADD_TYPE( float,     "float", 'f', "float", "Single", "!" );
-        ADD_TYPE( double,    "double", 'F', "double", "Double", "#" );
-        ADD_TYPE( SbxObject, "VARIANT", 'o', "C_Object", "Object", "" );
+        ADD_TYPE( UINT16,    'h', "unsigned short", "Long", "&" );
+        ADD_TYPE( INT16,     'h', "short", "Integer", "%" );
+        ADD_TYPE( UINT32,    'l', "unsigned long", "Long", "&" );
+        ADD_TYPE( INT32,     'l', "long", "Long", "&" );
+        ADD_TYPE( int,       'i', "int", "Integer", "%" );
+        ADD_TYPE( BOOL,      'b', "unsigned char", "Boolean", "" );
+        ADD_TYPE( char,      'c', "char", "Integer", "%" );
+        ADD_TYPE( BYTE,      'c', "unsigned char", "Integer", "%" );
+        ADD_TYPE( float,     'f', "float", "Single", "!" );
+        ADD_TYPE( double,    'F', "double", "Double", "#" );
+        ADD_TYPE( SbxObject, 'o', "C_Object", "Object", "" );
 
         // Attention! When adding types all binary data bases get incompatible
 
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index f30bf10d0bbf..2925435ede46 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -96,7 +96,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(SvName)
     A_ENTRY(SbxName)
     A_ENTRY(ItemName)
-    A_ENTRY(OdlName)
     A_ENTRY(include)
     A_ENTRY(ExecMethod)
     A_ENTRY(StateMethod)