remove unused Automation from .SDI files

Change-Id: I65e1ca6e022dc76ac96ed75da2c5e78e9356a3e9
Reviewed-on: https://gerrit.libreoffice.org/22107
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

7 files changed, 2 insertions, 54 deletions

diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index ae7df268e8d6..50286b7dfd7b 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -78,7 +78,6 @@ struct SvGlobalHashNames
     SvStringHashEntryRef MM_GroupId;
     SvStringHashEntryRef MM_TypeLibFile;
     SvStringHashEntryRef MM_Export;
-    SvStringHashEntryRef MM_Automation;
     SvStringHashEntryRef MM_PseudoPrefix;
     SvStringHashEntryRef MM_define;
     SvStringHashEntryRef MM_MenuConfig;
@@ -172,7 +171,6 @@ HASH_INLINE(float)
 HASH_INLINE(double)
 HASH_INLINE(TypeLibFile)
 HASH_INLINE(Export)
-HASH_INLINE(Automation)
 HASH_INLINE(PseudoPrefix)
 HASH_INLINE(define)
 HASH_INLINE(MenuConfig)
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 650ee4efa65e..34005e57af0d 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -40,9 +40,8 @@ typedef ::std::vector< SvMetaClass* > SvMetaClassList;
 typedef tools::SvRef<SvMetaClass> SvMetaClassRef;
 class SvClassElement : public SvRttiBase
 {
-    SvBOOL                      aAutomation;
     OString                aPrefix;
-    SvMetaClassRef              xClass;
+    SvMetaClassRef         xClass;
 public:
             SvClassElement();
 
@@ -51,8 +50,6 @@ public:
     const OString&  GetPrefix() const
                     { return aPrefix; }
 
-    void            SetAutomation( bool rAutomation )
-                    { aAutomation = rAutomation; }
     void            SetClass( SvMetaClass * pClass )
                     { xClass = pClass; }
     SvMetaClass *   GetClass() const
@@ -68,8 +65,6 @@ class SvMetaClass : public SvMetaType
     SvMetaAttributeMemberList   aAttrList;
     SvClassElementMemberList    aClassList;
     SvMetaClassRef              aSuperClass;
-    SvBOOL                      aAutomation;
-    SvMetaClassRef              xAutomationInterface;
 
     bool                    TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
                                      SvMetaAttribute & rAttr ) const;
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 4f342753689a..1788775ab35e 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -36,7 +36,6 @@ class SvMetaAttribute : public SvMetaReference
 {
     SvMetaTypeRef       aType;
     SvIdentifier        aSlotId;
-    SvBOOL              aAutomation;
     SvBOOL              aExport;
     SvBOOL              aReadonly;
     SvBOOL              aIsCollection;
@@ -59,7 +58,6 @@ public:
     const SvIdentifier & GetSlotId() const;
     bool                GetExport() const;
     bool                GetHidden() const;
-    bool                GetAutomation() const;
     bool                GetIsCollection() const;
     bool                GetReadOnlyDoc() const;
     SvMetaType *        GetType() const;
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 2aec4e5e84ff..d8d633aaa9a3 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -36,7 +36,6 @@ SvClassElement::SvClassElement()
 };
 
 SvMetaClass::SvMetaClass()
-    : aAutomation( true, false )
 {
 }
 
@@ -44,7 +43,6 @@ void SvMetaClass::ReadAttributesSvIdl( SvIdlDataBase & rBase,
                                         SvTokenStream & rInStm )
 {
     SvMetaType::ReadAttributesSvIdl( rBase, rInStm );
-    aAutomation.ReadSvIdl( SvHash_Automation(), rInStm );
 }
 
 void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
@@ -62,36 +60,6 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
             xEle->SetClass( pClass );
             aClassList.push_back( xEle );
 
-            if( rInStm.Read( '[' ) )
-            {
-                pTok = rInStm.GetToken_Next();
-                if( pTok->Is( SvHash_Automation() ) )
-                {
-                    if( rInStm.Read( ']' ) )
-                    {
-                        if( xAutomationInterface.Is() )
-                        {
-                            // set error
-                            rBase.SetError( "Automation already set", rInStm.GetToken() );
-                            rBase.WriteError( rInStm );
-                        }
-                        xAutomationInterface = pClass;
-                        xEle->SetAutomation( true );
-                    }
-                    else
-                    {
-                        // set error
-                        rBase.SetError( "missing ]", rInStm.GetToken() );
-                        rBase.WriteError( rInStm );
-                    }
-                }
-                else
-                {
-                    // set error
-                    rBase.SetError( "only attribute Automation allowed", rInStm.GetToken() );
-                    rBase.WriteError( rInStm );
-                }
-            }
             pTok = &rInStm.GetToken();
             if( pTok->IsString() )
             {
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 662e39644002..10d8e7c670e2 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -30,8 +30,7 @@
 #include <database.hxx>
 
 SvMetaAttribute::SvMetaAttribute()
-    : aAutomation( true, false )
-    , aExport( true, false )
+    : aExport( true, false )
     , aIsCollection ( false, false )
     , aReadOnlyDoc ( true, false )
     , aHidden( false, false )
@@ -41,7 +40,6 @@ SvMetaAttribute::SvMetaAttribute()
 
 SvMetaAttribute::SvMetaAttribute( SvMetaType * pType )
     : aType( pType )
-    , aAutomation( true, false )
     , aExport( true, false )
     , aIsCollection ( false, false)
     , aReadOnlyDoc ( true, false)
@@ -85,12 +83,6 @@ bool SvMetaAttribute::GetHidden() const
         return static_cast<SvMetaAttribute *>(GetRef())->GetHidden();
 }
 
-bool SvMetaAttribute::GetAutomation() const
-{
-    if( aAutomation.IsSet() || !GetRef() ) return aAutomation;
-    return static_cast<SvMetaAttribute *>(GetRef())->GetAutomation();
-}
-
 bool SvMetaAttribute::GetIsCollection() const
 {
     if( aIsCollection.IsSet() || !GetRef() )
@@ -184,7 +176,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     aSlotId.ReadSvIdl( rBase, SvHash_SlotId(), rInStm );
     aExport.ReadSvIdl( SvHash_Export(), rInStm );
     aHidden.ReadSvIdl( SvHash_Hidden(), rInStm );
-    aAutomation.ReadSvIdl( SvHash_Automation(), rInStm );
     aIsCollection.ReadSvIdl( SvHash_IsCollection(), rInStm );
     aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm );
     if( aReadonly.ReadSvIdl( SvHash_Readonly(), rInStm ) )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index ccf99c0d2444..1fdbef4a9dd3 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -75,7 +75,6 @@ char const * SyntaxStrings[] = {
 
 "\t\titem-method-args",
 "\t\tAccelConfig, MenuConfig, ToolbarConfig",
-"\t\tAutomation*",
 "\t\tAutoUpdate",
 "\t\tContainer",
 "\t\tDefault        = Identifier",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 190336f791d7..4106eda5211d 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -105,7 +105,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(GroupId)
     A_ENTRY(TypeLibFile)
     A_ENTRY(Export)
-    A_ENTRY(Automation)
     A_ENTRY(PseudoPrefix)
     A_ENTRY(define)
     A_ENTRY(MenuConfig)