remove unused UUID and VERSION from .SDI files

Change-Id: Ieb3e47c10c497a6f642f28a6741ac0fd2ecfd419

11 files changed, 0 insertions, 168 deletions

diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 2f39313db2e7..a0b3a090cdf6 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -181,21 +181,13 @@ class SvMetaExtern : public SvMetaReference
 {
     SvMetaModule *          pModule;    // included in which module
 
-    SvUUId                  aUUId;
-    SvVersion               aVersion;
-    bool                    bReadUUId;
-    bool                    bReadVersion;
 public:
                         SvMetaExtern();
 
     SvMetaModule *      GetModule() const;
 
-    void                GetUUId() const;
     void                SetModule( SvIdlDataBase & rBase );
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
-
-protected:
-    virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
 };
 
 class SvMetaExternMemberList : public SvRefMemberList<SvMetaExtern *> {};
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 3fd6069a7373..6448e71e3229 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -120,24 +120,6 @@ class SvHelpContext : public SvIdentifier
 {
 };
 
-class SvUUId : public SvGlobalName
-{
-public:
-                SvUUId() {}
-    bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-};
-
-
-class SvVersion
-{
-    sal_uInt16  nMajorVersion;
-    sal_uInt16  nMinorVersion;
-public:
-                SvVersion() : nMajorVersion( 1 ), nMinorVersion( 0 ) {}
-    bool        ReadSvIdl( SvTokenStream & rInStm );
-};
-
-
 #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 b6165ab1c5fc..64a8da7c69aa 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -35,7 +35,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_String;
     SvStringHashEntryRef MM_UCHAR;
     SvStringHashEntryRef MM_USHORT;
-    SvStringHashEntryRef MM_uuid;
     SvStringHashEntryRef MM_HelpContext;
     SvStringHashEntryRef MM_HelpText;
     SvStringHashEntryRef MM_void;
@@ -65,7 +64,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_map;
     SvStringHashEntryRef MM_Default;
     SvStringHashEntryRef MM_HelpFile;
-    SvStringHashEntryRef MM_Version;
     SvStringHashEntryRef MM_import;
     SvStringHashEntryRef MM_SlotIdFile;
     SvStringHashEntryRef MM_SvName;
@@ -89,7 +87,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_Container;
     SvStringHashEntryRef MM_ImageRotation;
     SvStringHashEntryRef MM_ImageReflection;
-    SvStringHashEntryRef MM_IsCollection;
     SvStringHashEntryRef MM_ReadOnlyDoc;
     SvStringHashEntryRef MM_union;
     SvStringHashEntryRef MM_struct;
@@ -130,7 +127,6 @@ HASH_INLINE(interface)
 HASH_INLINE(in)
 HASH_INLINE(out)
 HASH_INLINE(inout)
-HASH_INLINE(uuid)
 HASH_INLINE(HelpContext)
 HASH_INLINE(HelpText)
 HASH_INLINE(shell)
@@ -156,7 +152,6 @@ HASH_INLINE(item)
 HASH_INLINE(PseudoSlots)
 HASH_INLINE(Default)
 HASH_INLINE(HelpFile)
-HASH_INLINE(Version)
 HASH_INLINE(import)
 HASH_INLINE(SlotIdFile)
 HASH_INLINE(SvName)
@@ -181,7 +176,6 @@ HASH_INLINE(SbxObject)
 HASH_INLINE(Container)
 HASH_INLINE(ImageRotation)
 HASH_INLINE(ImageReflection)
-HASH_INLINE(IsCollection)
 HASH_INLINE(ReadOnlyDoc)
 HASH_INLINE(union)
 HASH_INLINE(struct)
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index b6e67e7fa11a..67df87164746 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -38,7 +38,6 @@ class SvMetaModule : public SvMetaExtern
                             bIsModified : 1;
     SvGlobalName            aBeginName;
     SvGlobalName            aEndName;
-    SvGlobalName            aNextName;
 protected:
     virtual void        ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
     virtual void        ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
@@ -48,7 +47,6 @@ public:
 
                         SvMetaModule( bool bImported );
 
-    bool                FillNextName( SvGlobalName * );
     bool                IsImported() const { return bImported; }
 
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 6b8a0ae32e9b..69e3928822fa 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -37,7 +37,6 @@ class SvMetaAttribute : public SvMetaReference
     SvMetaTypeRef       aType;
     SvIdentifier        aSlotId;
     SvBOOL              aExport;
-    SvBOOL              aIsCollection;
     SvBOOL              aReadOnlyDoc;
     SvBOOL              aHidden;
     bool                bNewAttr;
@@ -56,7 +55,6 @@ public:
     const SvIdentifier & GetSlotId() const;
     bool                GetExport() const;
     bool                GetHidden() const;
-    bool                GetIsCollection() const;
     bool                GetReadOnlyDoc() const;
     SvMetaType *        GetType() const;
 
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 0a4fb4e60d4f..397ed7a7d5c4 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -164,8 +164,6 @@ SvMetaReference::SvMetaReference()
 
 SvMetaExtern::SvMetaExtern()
     : pModule( nullptr )
-    , bReadUUId( false )
-    , bReadVersion( false )
 {
 }
 
@@ -175,31 +173,14 @@ SvMetaModule * SvMetaExtern::GetModule() const
     return pModule;
 }
 
-void SvMetaExtern::GetUUId() const
-{
-    if( aUUId == SvGlobalName() )
-        GetModule()->FillNextName( &const_cast<SvMetaExtern *>(this)->aUUId );
-}
-
 void SvMetaExtern::SetModule( SvIdlDataBase & rBase )
 {
     pModule = static_cast<SvMetaModule *>(rBase.GetStack().Get( checkSvMetaObject<SvMetaModule> ));
 }
 
-void SvMetaExtern::ReadAttributesSvIdl( SvIdlDataBase & rBase,
-                                        SvTokenStream & rInStm )
-{
-    SvMetaReference::ReadAttributesSvIdl( rBase, rInStm );
-    if( aUUId.ReadSvIdl( rBase, rInStm ) )
-        bReadUUId = true;
-    if( aVersion.ReadSvIdl( rInStm ) )
-        bReadVersion = true;
-}
-
 bool SvMetaExtern::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
     SetModule( rBase );
-    GetUUId(); // id gets created
     return SvMetaReference::ReadSvIdl( rBase, rInStm );
 }
 
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 40b317e58443..becefb80074b 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -28,36 +28,6 @@
 #include <osl/diagnose.h>
 #include <tools/stream.hxx>
 
-static bool ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
-                            sal_uLong nMin, sal_uLong nMax, sal_uLong* pValue )
-{
-    sal_uInt32 nTokPos = rInStm.Tell();
-    SvToken * pTok = rInStm.GetToken_Next();
-    if( pTok->Is( pName ) )
-    {
-        bool bOk = false;
-        if( rInStm.Read( '=' ) )
-        {
-            pTok = rInStm.GetToken_Next();
-            if( pTok->IsInteger() )
-            {
-                sal_uLong n = pTok->GetNumber();
-                if ( n >= nMin && n <= nMax )
-                {
-                    *pValue = n;
-                    bOk = true;
-                }
-            }
-        }
-
-        if( bOk )
-            return true;
-    }
-
-    rInStm.Seek( nTokPos );
-    return false;
-}
-
 bool SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
 {
     sal_uInt32 nTokPos = rInStm.Tell();
@@ -195,55 +165,4 @@ void SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
     SvString::ReadSvIdl( SvHash_HelpText(), rInStm );
 }
 
-bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
-{
-    sal_uInt32 nTokPos = rInStm.Tell();
-    SvToken * pTok = rInStm.GetToken_Next();
-
-    if( pTok->Is( SvHash_uuid() ) )
-    {
-        bool bOk = true;
-        bool bBraket = rInStm.Read( '(' );
-        if( bBraket || rInStm.Read( '=' ) )
-        {
-            pTok = &rInStm.GetToken();
-            if( pTok->IsString() )
-            {
-                pTok = rInStm.GetToken_Next();
-                bOk = MakeId(OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
-            }
-            if( bOk && bBraket )
-                bOk = rInStm.Read( ')' );
-        }
-        if( bOk )
-            return true;
-    }
-    rInStm.Seek( nTokPos );
-    return false;
-}
-
-bool SvVersion::ReadSvIdl( SvTokenStream & rInStm )
-{
-    sal_uLong n = 0;
-
-    sal_uInt32 nTokPos = rInStm.Tell();
-    if( ReadRangeSvIdl( SvHash_Version(), rInStm, 0 , 0xFFFF, &n ) )
-    {
-        nMajorVersion = (sal_uInt16)n;
-        if( rInStm.Read( '.' ) )
-        {
-            SvToken * pTok = rInStm.GetToken_Next();
-            if( pTok->IsInteger() && pTok->GetNumber() <= 0xFFFF )
-            {
-                nMinorVersion = (sal_uInt16)pTok->GetNumber();
-                return true;
-            }
-        }
-        else
-            return true;
-    }
-    rInStm.Seek( nTokPos );
-    return false;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 0109211adec9..21c4e7614538 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -43,19 +43,6 @@ bool SvMetaModule::SetName( const OString& rName, SvIdlDataBase * pBase )
     return SvMetaExtern::SetName( rName );
 }
 
-bool SvMetaModule::FillNextName( SvGlobalName * pName )
-{
-    *pName = aNextName;
-
-    if( aNextName < aEndName )
-    {
-        ++aNextName;
-        bIsModified = true;
-        return true;
-    }
-    return false;
-}
-
 void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                         SvTokenStream & rInStm )
 {
@@ -216,8 +203,6 @@ bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
     rInStm.ReadDelemiter();
     if( bOk )
     {
-        aNextName = aBeginName;
-
         rBase.Push( this ); // onto the context stack
 
         if( ReadNameSvIdl( rBase, rInStm ) )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 71312b1d1bf8..8249cf14df78 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -31,7 +31,6 @@
 
 SvMetaAttribute::SvMetaAttribute()
     : aExport( true, false )
-    , aIsCollection ( false, false )
     , aReadOnlyDoc ( true, false )
     , aHidden( false, false )
     , bNewAttr( false )
@@ -41,7 +40,6 @@ SvMetaAttribute::SvMetaAttribute()
 SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
     : aType( pType )
     , aExport( true, false )
-    , aIsCollection ( false, false)
     , aReadOnlyDoc ( true, false)
     , aHidden( false, false )
     , bNewAttr( false )
@@ -77,16 +75,6 @@ bool SvMetaAttribute::GetHidden() const
         return static_cast<SvMetaAttribute *>(GetRef())->GetHidden();
 }
 
-bool SvMetaAttribute::GetIsCollection() const
-{
-    if( aIsCollection.IsSet() || !GetRef() )
-    {
-        return aIsCollection;
-    }
-
-    return static_cast<SvMetaSlot *>(GetRef())->GetIsCollection();
-}
-
 bool SvMetaAttribute::GetReadOnlyDoc() const
 {
     if( aReadOnlyDoc.IsSet() || !GetRef() ) return aReadOnlyDoc;
@@ -170,7 +158,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     aSlotId.ReadSvIdl( rBase, SvHash_SlotId(), rInStm );
     aExport.ReadSvIdl( SvHash_Export(), rInStm );
     aHidden.ReadSvIdl( SvHash_Hidden(), rInStm );
-    aIsCollection.ReadSvIdl( SvHash_IsCollection(), rInStm );
     aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm );
 }
 
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 30da37097624..8a42ef19ec25 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -83,7 +83,6 @@ char const * SyntaxStrings[] = {
 "\t\tFastCall",
 "\t\tGet, Set",
 "\t\tGroupId        = Identifier",
-"\t\tIsCollection",
 "\t\tImageRotation",
 "\t\tImageReflection",
 "\t\tPseudoPrefix   = Identifier",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 89d4b16b23de..b46035da43de 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -63,7 +63,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     , MM_String( INS( "String" ) )
     , MM_UCHAR( INS( "UCHAR" ) )
     , MM_USHORT( INS( "USHORT" ) )
-    , MM_uuid( INS( "uuid" ) )
     , MM_HelpContext( INS( "HelpContext" ) )
     , MM_HelpText( INS( "HelpText" ) )
     , MM_void( INS( "void" ) )
@@ -92,7 +91,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(map)
     A_ENTRY(Default)
     A_ENTRY(HelpFile)
-    A_ENTRY(Version)
     A_ENTRY(import)
     A_ENTRY(SlotIdFile)
     A_ENTRY(SvName)
@@ -116,7 +114,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(Container)
     A_ENTRY(ImageRotation)
     A_ENTRY(ImageReflection)
-    A_ENTRY(IsCollection)
     A_ENTRY(ReadOnlyDoc)
     A_ENTRY(union)
     A_ENTRY(struct)