remove unused union from .SDI files

Change-Id: I673e5a020279e323cccf50d0ff3d74166ef61329

5 files changed, 2 insertions, 11 deletions

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 74016d6b6a85..773cb1880c84 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -68,7 +68,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_ImageRotation;
     SvStringHashEntryRef MM_ImageReflection;
     SvStringHashEntryRef MM_ReadOnlyDoc;
-    SvStringHashEntryRef MM_union;
     SvStringHashEntryRef MM_struct;
     SvStringHashEntryRef MM_typedef;
     SvStringHashEntryRef MM_SlotType;
@@ -141,7 +140,6 @@ HASH_INLINE(Container)
 HASH_INLINE(ImageRotation)
 HASH_INLINE(ImageReflection)
 HASH_INLINE(ReadOnlyDoc)
-HASH_INLINE(union)
 HASH_INLINE(struct)
 HASH_INLINE(typedef)
 HASH_INLINE(SlotType)
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 2dc6c514cc3f..0cc7e3c0c8fd 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -75,7 +75,7 @@ typedef tools::SvRef<SvMetaAttribute> SvMetaAttributeRef;
 class SvMetaAttributeMemberList : public SvRefMemberList<SvMetaAttribute *> {};
 
 enum { CALL_VALUE, CALL_POINTER, CALL_REFERENCE };
-enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM, TYPE_UNION,
+enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM,
       TYPE_CLASS, TYPE_POINTER };
 class SvMetaType : public SvMetaExtern
 {
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 704bbb41061c..d3ec6a75819b 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -350,12 +350,6 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
         SetType( TYPE_STRUCT );
         bOk = ReadNamesSvIdl( rBase, rInStm );
     }
-    else if( pTok->Is( SvHash_union() ) )
-    {
-        SetType( TYPE_UNION );
-        if( ReadNameSvIdl( rBase, rInStm ) )
-            return true;
-    }
     else if( pTok->Is( SvHash_enum() ) )
     {
         SetType( TYPE_ENUM );
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index f2181ec6d830..4db8ca592d27 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -51,7 +51,7 @@ char const * SyntaxStrings[] = {
 "\titem type item-name;\n",
 
 "\ttype definition:",
-"\tstruct | union identifier",
+"\tstruct identifier",
 "\t'{'",
 "\t\t{ type idetifier }",
 "\t'}'",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index cb4f9672e939..0b35521ae645 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -96,7 +96,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(ImageRotation)
     A_ENTRY(ImageReflection)
     A_ENTRY(ReadOnlyDoc)
-    A_ENTRY(union)
     A_ENTRY(struct)
     A_ENTRY(typedef)
     A_ENTRY(SlotType)