remove unused SbxName from .SDI files

Change-Id: I1d0bd2477d22c5f71fd61882756e05e2e30dfa6f

5 files changed, 4 insertions, 21 deletions

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 7da64bba940c..c9c47698e6f3 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -67,7 +67,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_import;
     SvStringHashEntryRef MM_SlotIdFile;
     SvStringHashEntryRef MM_SvName;
-    SvStringHashEntryRef MM_SbxName;
     SvStringHashEntryRef MM_ItemName;
     SvStringHashEntryRef MM_include;
     SvStringHashEntryRef MM_ExecMethod;
@@ -153,7 +152,6 @@ HASH_INLINE(HelpFile)
 HASH_INLINE(import)
 HASH_INLINE(SlotIdFile)
 HASH_INLINE(SvName)
-HASH_INLINE(SbxName)
 HASH_INLINE(include)
 HASH_INLINE(ExecMethod)
 HASH_INLINE(StateMethod)
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index ff3658433b84..7d99cf90e6d9 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -83,7 +83,6 @@ class SvMetaType : public SvMetaExtern
     SvBOOL                      aOut;   // return parameter
     Svint                       aCall0, aCall1;
     SvIdentifier                aSvName;
-    SvIdentifier                aSbxName;
     SvIdentifier                aCName;
     SvIdentifier                aBasicPostfix;
     SvIdentifier                aBasicName;
@@ -106,7 +105,7 @@ public:
             SvMetaType();
             SvMetaType( const OString& rTypeName, char cParserChar,
                                 const OString& rCName );
-            SvMetaType( const OString& rTypeName, const OString& rSbxName,
+            SvMetaType( const OString& rTypeName,
                         char cParserChar,
                         const OString& rCName, const OString& rBasicName,
                         const OString& rBasicPostfix );
@@ -143,7 +142,6 @@ public:
 
     const OString&      GetBasicName() const;
     const OString&      GetSvName() const;
-    const OString&      GetSbxName() const;
     const OString&      GetCName() const;
     char                GetParserChar() const { return cParserChar; }
 
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index ed5275ecc8a1..797bd13a6055 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -208,7 +208,6 @@ SvMetaType::SvMetaType( const OString& rName, char cPC,
 }
 
 SvMetaType::SvMetaType( const OString& rName,
-                        const OString& rSbxName,
                         char cPc,
                         const OString& rCName,
                         const OString& rBasicName,
@@ -216,7 +215,6 @@ SvMetaType::SvMetaType( const OString& rName,
     CTOR
 {
     SetName( rName );
-    aSbxName.setString(rSbxName);
     cParserChar = cPc;
     aCName.setString(rCName);
     aBasicName.setString(rBasicName);
@@ -342,14 +340,6 @@ const OString& SvMetaType::GetSvName() const
         return static_cast<SvMetaType *>(GetRef())->GetSvName();
 }
 
-const OString& SvMetaType::GetSbxName() const
-{
-    if( aSbxName.IsSet() || !GetRef() )
-        return aSbxName.getString();
-    else
-        return static_cast<SvMetaType *>(GetRef())->GetSbxName();
-}
-
 const OString& SvMetaType::GetCName() const
 {
     if( aCName.IsSet() || !GetRef() )
@@ -361,7 +351,6 @@ const OString& SvMetaType::GetCName() const
 bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase )
 {
     aSvName.setString(rName);
-    aSbxName.setString(rName);
     aCName.setString(rName);
     return SvMetaReference::SetName( rName, pBase );
 }
@@ -463,7 +452,6 @@ void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase,
 {
     SvMetaExtern::ReadAttributesSvIdl( rBase, rInStm );
     aSvName.ReadSvIdl( SvHash_SvName(), rInStm );
-    aSbxName.ReadSvIdl( SvHash_SbxName(), rInStm );
 }
 
 void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase,
@@ -609,7 +597,7 @@ OString SvMetaType::GetParserString() const
 }
 
 SvMetaTypeString::SvMetaTypeString()
-    : SvMetaType( "String", "SbxSTRING", 's', "char *", "String", "$" )
+    : SvMetaType( "String", 's', "char *", "String", "$" )
 {
 }
 
@@ -685,7 +673,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
 }
 
 SvMetaTypevoid::SvMetaTypevoid()
-    : SvMetaType( "void", "SbxVOID", 'v', "void", "", "" )
+    : SvMetaType( "void", 'v', "void", "", "" )
 {
 }
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 10682cf7599a..cfe2b5b1d86b 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -47,7 +47,7 @@ SvIdlDataBase::~SvIdlDataBase()
 
 #define ADD_TYPE( Name, ParserChar, CName, BasName, BasPost )            \
     aTypeList.push_back( new SvMetaType( SvHash_##Name()->GetName(),   \
-                     BasName, ParserChar, CName, BasName, BasPost ) );
+                     ParserChar, CName, BasName, BasPost ) );
 
 SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
 {
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 2925435ede46..1770eecd1a8e 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -94,7 +94,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(import)
     A_ENTRY(SlotIdFile)
     A_ENTRY(SvName)
-    A_ENTRY(SbxName)
     A_ENTRY(ItemName)
     A_ENTRY(include)
     A_ENTRY(ExecMethod)