remove unused HelpContext/Name/UCHAR/USHORT from .SDI files

Change-Id: Ic837cfb952730f10d2669095134ab2eb10bd72e5

5 files changed, 1 insertions, 24 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index a0b3a090cdf6..b89c62fb0324 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -88,7 +88,6 @@ class SvMetaObject : public SvRttiBase
 {
 protected:
     SvString      aName;
-    SvHelpContext aHelpContext;
     SvHelpText    aHelpText;
     SvString      aDescription;
 
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 6448e71e3229..6891d48260e4 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -116,10 +116,6 @@ public:
 };
 
 
-class SvHelpContext : public SvIdentifier
-{
-};
-
 #endif // INCLUDED_IDL_INC_BASTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index cf8a8354b8a8..f91b7c1ed487 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -26,13 +26,9 @@
 class SvClassManager;
 struct SvGlobalHashNames
 {
-    SvStringHashEntryRef MM_Name;
     SvStringHashEntryRef MM_module;
     SvStringHashEntryRef MM_interface;
     SvStringHashEntryRef MM_String;
-    SvStringHashEntryRef MM_UCHAR;
-    SvStringHashEntryRef MM_USHORT;
-    SvStringHashEntryRef MM_HelpContext;
     SvStringHashEntryRef MM_HelpText;
     SvStringHashEntryRef MM_void;
     SvStringHashEntryRef MM_shell;
@@ -112,10 +108,8 @@ inline SvStringHashEntry * SvHash_##Name()                   \
     return GetIdlApp().pGlobalNames->MM_##Name;              \
 }
 
-HASH_INLINE(Name)
 HASH_INLINE(module)
 HASH_INLINE(interface)
-HASH_INLINE(HelpContext)
 HASH_INLINE(HelpText)
 HASH_INLINE(shell)
 HASH_INLINE(SlotId)
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 397ed7a7d5c4..6942a71c0b98 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -90,14 +90,6 @@ bool SvMetaObject::ReadNameSvIdl( SvIdlDataBase & rBase,
 void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                       SvTokenStream & rInStm )
 {
-    sal_uInt32 nTokPos = rInStm.Tell();
-    if( aName.ReadSvIdl( SvHash_Name(), rInStm ) )
-    {
-        if( !SetName( aName.getString(), &rBase ) )
-            rInStm.Seek( nTokPos );
-    }
-
-    aHelpContext.ReadSvIdl( rBase, SvHash_HelpContext(), rInStm );
     aHelpText.ReadSvIdl( rBase, rInStm );
     aDescription.ReadSvIdl( SvHash_Description(), rInStm );
 }
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index fe8ff3a3cf60..3ecc2f42f77e 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -54,13 +54,9 @@ inline SvStringHashEntry * INS( const OString& rName )
 #define A_ENTRY( Name ) , MM_##Name( INS( #Name ) )
 
 SvGlobalHashNames::SvGlobalHashNames()
-    : MM_Name( INS( "Name" ) )
-    , MM_module( INS( "module" ) )
+    : MM_module( INS( "module" ) )
     , MM_interface( INS( "interface" ) )
     , MM_String( INS( "String" ) )
-    , MM_UCHAR( INS( "UCHAR" ) )
-    , MM_USHORT( INS( "USHORT" ) )
-    , MM_HelpContext( INS( "HelpContext" ) )
     , MM_HelpText( INS( "HelpText" ) )
     , MM_void( INS( "void" ) )
     , MM_shell( INS( "shell" ) )