From e02d63406ac3d1c99661d1e706d8c367c30b3a9e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 4 Feb 2016 11:28:55 +0200
Subject: remove unused SvName from .SDI files

Change-Id: I5aa9d2e3798ebb9da5bb1283000d744e9a68de25
---
 idl/inc/globals.hxx          |  2 --
 idl/inc/types.hxx            |  3 ---
 idl/source/objects/types.cxx | 16 ----------------
 idl/source/prj/globals.cxx   |  1 -
 4 files changed, 22 deletions(-)

(limited to 'idl')

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index c9c47698e6f3..0cd591cc68c5 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -66,7 +66,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_HelpFile;
     SvStringHashEntryRef MM_import;
     SvStringHashEntryRef MM_SlotIdFile;
-    SvStringHashEntryRef MM_SvName;
     SvStringHashEntryRef MM_ItemName;
     SvStringHashEntryRef MM_include;
     SvStringHashEntryRef MM_ExecMethod;
@@ -151,7 +150,6 @@ HASH_INLINE(Default)
 HASH_INLINE(HelpFile)
 HASH_INLINE(import)
 HASH_INLINE(SlotIdFile)
-HASH_INLINE(SvName)
 HASH_INLINE(include)
 HASH_INLINE(ExecMethod)
 HASH_INLINE(StateMethod)
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 7d99cf90e6d9..9de51df4ed96 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -82,7 +82,6 @@ class SvMetaType : public SvMetaExtern
     SvBOOL                      aIn;    // input parameter
     SvBOOL                      aOut;   // return parameter
     Svint                       aCall0, aCall1;
-    SvIdentifier                aSvName;
     SvIdentifier                aCName;
     SvIdentifier                aBasicPostfix;
     SvIdentifier                aBasicName;
@@ -97,7 +96,6 @@ class SvMetaType : public SvMetaExtern
 protected:
     bool        ReadNamesSvIdl( SvIdlDataBase & rBase,
                                          SvTokenStream & rInStm );
-    virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
     virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
 
     bool    ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
@@ -141,7 +139,6 @@ public:
                         { aBasicName.setString(rName); }
 
     const OString&      GetBasicName() const;
-    const OString&      GetSvName() 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 797bd13a6055..61f83ca817bd 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -332,14 +332,6 @@ int SvMetaType::GetCall1() const
         return static_cast<SvMetaType *>(GetRef())->GetCall1();
 }
 
-const OString& SvMetaType::GetSvName() const
-{
-    if( aSvName.IsSet() || !GetRef() )
-        return aSvName.getString();
-    else
-        return static_cast<SvMetaType *>(GetRef())->GetSvName();
-}
-
 const OString& SvMetaType::GetCName() const
 {
     if( aCName.IsSet() || !GetRef() )
@@ -350,7 +342,6 @@ const OString& SvMetaType::GetCName() const
 
 bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase )
 {
-    aSvName.setString(rName);
     aCName.setString(rName);
     return SvMetaReference::SetName( rName, pBase );
 }
@@ -447,13 +438,6 @@ bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
     return bOk;
 }
 
-void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase,
-                                      SvTokenStream & rInStm )
-{
-    SvMetaExtern::ReadAttributesSvIdl( rBase, rInStm );
-    aSvName.ReadSvIdl( SvHash_SvName(), rInStm );
-}
-
 void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm )
 {
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 1770eecd1a8e..4c95cc0bce77 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -93,7 +93,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(HelpFile)
     A_ENTRY(import)
     A_ENTRY(SlotIdFile)
-    A_ENTRY(SvName)
     A_ENTRY(ItemName)
     A_ENTRY(include)
     A_ENTRY(ExecMethod)
-- 
cgit