[Libreoffice-commits] core.git: basctl/sdi idl/inc idl/source sc/sdi sd/sdi sfx2/sdi starmath/sdi svx/sdi sw/sdi

Noel Grandin noel at peralex.com
Fri Feb 5 05:59:38 UTC 2016


 basctl/sdi/baside.sdi            |    4 ++--
 idl/inc/globals.hxx              |    2 --
 idl/inc/object.hxx               |    7 +------
 idl/inc/types.hxx                |    2 --
 idl/source/objects/object.cxx    |   32 --------------------------------
 idl/source/objects/types.cxx     |   11 +----------
 idl/source/prj/command.cxx       |    1 -
 idl/source/prj/globals.cxx       |    1 -
 sc/sdi/app.sdi                   |    2 +-
 sc/sdi/cellsh.sdi                |    2 +-
 sc/sdi/docsh.sdi                 |    2 +-
 sc/sdi/formatsh.sdi              |    2 +-
 sc/sdi/tabvwsh.sdi               |    2 +-
 sd/sdi/SlideSorterController.sdi |    4 ++--
 sd/sdi/ViewShellBase.sdi         |    2 +-
 sd/sdi/app.sdi                   |    2 +-
 sd/sdi/docshell.sdi              |    2 +-
 sd/sdi/drviewsh.sdi              |    6 +++---
 sd/sdi/grdocsh.sdi               |    2 +-
 sd/sdi/grviewsh.sdi              |    2 +-
 sd/sdi/outlnvsh.sdi              |    2 +-
 sfx2/sdi/appslots.sdi            |    5 +----
 sfx2/sdi/docslots.sdi            |    8 +-------
 sfx2/sdi/frmslots.sdi            |   11 +----------
 sfx2/sdi/viwslots.sdi            |    5 +----
 starmath/sdi/smslots.sdi         |    6 +++---
 svx/sdi/fmslots.sdi              |    2 +-
 sw/sdi/_annotsh.sdi              |    1 -
 sw/sdi/_basesh.sdi               |    3 ---
 sw/sdi/_beziers.sdi              |    1 -
 sw/sdi/_docsh.sdi                |    3 ---
 sw/sdi/_drwbase.sdi              |    3 ---
 sw/sdi/_formsh.sdi               |    3 ---
 sw/sdi/_frmsh.sdi                |    3 ---
 sw/sdi/_grfsh.sdi                |    3 ---
 sw/sdi/_listsh.sdi               |    3 ---
 sw/sdi/_mediash.sdi              |    3 ---
 sw/sdi/_navsh.sdi                |    1 -
 sw/sdi/_olesh.sdi                |    3 ---
 sw/sdi/_tabsh.sdi                |    3 ---
 sw/sdi/_textsh.sdi               |    3 ---
 sw/sdi/_viewsh.sdi               |    3 ---
 sw/sdi/annotsh.sdi               |    2 +-
 sw/sdi/basesh.sdi                |    2 +-
 sw/sdi/beziersh.sdi              |    2 +-
 sw/sdi/docsh.sdi                 |    4 ++--
 sw/sdi/drawsh.sdi                |    2 +-
 sw/sdi/drwbassh.sdi              |    5 +----
 sw/sdi/drwtxtsh.sdi              |    2 +-
 sw/sdi/formsh.sdi                |    2 +-
 sw/sdi/frmsh.sdi                 |    2 +-
 sw/sdi/grfsh.sdi                 |    2 +-
 sw/sdi/listsh.sdi                |    2 +-
 sw/sdi/mediash.sdi               |    2 +-
 sw/sdi/navsh.sdi                 |    2 +-
 sw/sdi/olesh.sdi                 |    2 +-
 sw/sdi/sidebar.sdi               |    2 +-
 sw/sdi/tabsh.sdi                 |    2 +-
 sw/sdi/textsh.sdi                |    2 +-
 sw/sdi/viewsh.sdi                |    4 ++--
 sw/sdi/wbasesh.sdi               |    5 +----
 sw/sdi/wbeziers.sdi              |    2 +-
 sw/sdi/wdocsh.sdi                |    2 +-
 sw/sdi/wdrwbase.sdi              |    5 +----
 sw/sdi/wformsh.sdi               |    2 +-
 sw/sdi/wfrmsh.sdi                |    2 +-
 sw/sdi/wgrfsh.sdi                |    2 +-
 sw/sdi/wlistsh.sdi               |    2 +-
 sw/sdi/wolesh.sdi                |    2 +-
 sw/sdi/wrtapp.sdi                |    2 +-
 sw/sdi/wtabsh.sdi                |    2 +-
 sw/sdi/wtextsh.sdi               |    2 +-
 sw/sdi/wviewsh.sdi               |    4 ++--
 73 files changed, 62 insertions(+), 183 deletions(-)

New commits:
commit fd97858e1a7eef0f311a38ee3be41f7548d2c174
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Feb 4 09:32:13 2016 +0200

    remove unused Automation from .SDI files
    
    Change-Id: I65e1ca6e022dc76ac96ed75da2c5e78e9356a3e9
    Reviewed-on: https://gerrit.libreoffice.org/22107
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 11ab061..40472c0 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -25,7 +25,7 @@ interface BasicIDEView
 
 shell basctl_Shell
 {
-    import BasicIDEView [Automation];
+    import BasicIDEView;
 
 
     // Current, je nach aktuellem Fenster:
@@ -516,6 +516,6 @@ interface BasicIDEDocument
 
 shell basctl_DocShell
 {
-    import BasicIDEDocument [Automation];
+    import BasicIDEDocument;
 }
 
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index ae7df26..50286b7 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 650ee4e..34005e5 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 4f34275..1788775 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 2aec4e5..d8d633a 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 662e396..10d8e7c 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 ccf99c0..1fdbef4 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 190336f..4106eda 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)
diff --git a/sc/sdi/app.sdi b/sc/sdi/app.sdi
index 0dbed4c..a61c684 100644
--- a/sc/sdi/app.sdi
+++ b/sc/sdi/app.sdi
@@ -78,7 +78,7 @@ interface StarCalc
 
 shell ScModule
 {
-            import StarCalc[Automation];
+            import StarCalc;
 }
 
 
diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi
index 5facf2d..1f1058a 100644
--- a/sc/sdi/cellsh.sdi
+++ b/sc/sdi/cellsh.sdi
@@ -443,5 +443,5 @@ interface Cell
 
 shell ScCellShell : ScFormatShell
 {
-    import Cell[Automation];
+    import Cell;
 }
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 509ed9b..4a9587e 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -112,5 +112,5 @@ shell ScDocShell
     uuid ( "3F543FA0-B6A6-101B-9961-04021C007002" )
 ]
 {
-        import TableDocument[Automation];
+        import TableDocument;
 }
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index a8bd8fb..8846b50 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -145,7 +145,7 @@ interface FormatForSelection
 
 shell ScFormatShell
 {
-    import FormatForSelection[Automation];
+    import FormatForSelection;
 //  import Interior ".Interior";
     import TableFont ".Font";
 }
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index ea01f2b..3d00916 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -273,7 +273,7 @@ shell ScTabViewShell
     import TableOLEObject "SelectedObject";
     import Tables "ActiveDocument.Tables";
     import BaseSelection;
-    import TableEditView[Automation];
+    import TableEditView;
 //  import SearchSettings;
 
 
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 5008e17..a6b2bb0 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -322,10 +322,10 @@ interface SlideSorterView
 
 shell SlideSorterController
 {
-    import SlideSorterView[Automation];
+    import SlideSorterView;
 }
 
 shell SlideSorterViewShell
 {
-    import SlideSorterView[Automation];
+    import SlideSorterView;
 }
diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi
index 1327a24..cc60732 100644
--- a/sd/sdi/ViewShellBase.sdi
+++ b/sd/sdi/ViewShellBase.sdi
@@ -143,5 +143,5 @@ interface ViewShellBaseView
 
 shell ViewShellBase
 {
-    import ViewShellBaseView[Automation];
+    import ViewShellBaseView;
 }
diff --git a/sd/sdi/app.sdi b/sd/sdi/app.sdi
index 7eaaf2e..e4e10d6 100644
--- a/sd/sdi/app.sdi
+++ b/sd/sdi/app.sdi
@@ -97,6 +97,6 @@ interface StarImpress
 
 shell SdModule
 {
-    import StarImpress[Automation];
+    import StarImpress;
 }
 
diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi
index 6cbb6b9..89a2766 100644
--- a/sd/sdi/docshell.sdi
+++ b/sd/sdi/docshell.sdi
@@ -25,5 +25,5 @@ interface ImpressDocument : DrawDocument
 
 shell DrawDocShell
 {
-    import ImpressDocument[Automation];
+    import ImpressDocument;
 }
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index 228467b..3ec71655 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -196,17 +196,17 @@ interface ImpressEditView : DrawView
 
 shell DrawViewShell
 {
-    import ImpressEditView[Automation];
+    import ImpressEditView;
 }
 
 
 shell PresentationViewShell
 {
-    import ImpressEditView[Automation];
+    import ImpressEditView;
 }
 
 
 shell PreviewViewShell
 {
-    import ImpressEditView[Automation];
+    import ImpressEditView;
 }
diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi
index 6f17114..892edfa 100644
--- a/sd/sdi/grdocsh.sdi
+++ b/sd/sdi/grdocsh.sdi
@@ -25,5 +25,5 @@ interface GraphicDocument : DrawDocument
 
 shell GraphicDocShell
 {
-    import GraphicDocument[Automation];
+    import GraphicDocument;
 }
diff --git a/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi
index 9b11817..3938b70 100644
--- a/sd/sdi/grviewsh.sdi
+++ b/sd/sdi/grviewsh.sdi
@@ -36,7 +36,7 @@ interface GraphicEditView : DrawView
 
 shell GraphicViewShell
 {
-    import GraphicEditView[Automation];
+    import GraphicEditView;
     SID_INSERT_POSTIT
     [
         ExecMethod = ExecuteAnnotation;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index bfd8c89..d94914c 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -552,6 +552,6 @@ interface OutlineView
 
 shell OutlineViewShell
 {
-    import OutlineView[Automation];
+    import OutlineView;
 }
 
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 442287e..962eac3 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -17,9 +17,6 @@
  */
 
 interface Application
-[
-    Automation = FALSE ;
-]
 {
     SID_AUTOPILOTMENU // ole(no) api(final/play/rec)
     [
@@ -220,7 +217,7 @@ interface Application
 
 shell SfxApplication
 {
-    import Application [Automation];
+    import Application;
     import Documents "Documents";
 
     SID_NEWDOCDIRECT // ole(no) api(no)
diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi
index 9398f72..4eb54f9 100644
--- a/sfx2/sdi/docslots.sdi
+++ b/sfx2/sdi/docslots.sdi
@@ -59,9 +59,6 @@ interface Documents
 
 
 interface Document
-[
-    Automation = FALSE ;
-]
 {
     SID_DOCTITLE // ole(opt) api(final/norec)
     [
@@ -95,9 +92,6 @@ interface Document
 }
 
 interface OfficeDocument : Document
-[
-    Automation = FALSE
-]
 {
     SID_DOCINFO_AUTHOR // ole(opt) api(todo)
     [
@@ -212,7 +206,7 @@ interface OfficeDocument : Document
 
 shell SfxObjectShell
 {
-    import OfficeDocument [Automation];
+    import OfficeDocument;
 
     SID_DOCINFO // ole(no) api(final/play)
     [
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index f1c4d84..d187e12 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -17,9 +17,6 @@
  */
 
 interface Window
-[
-    Automation = FALSE ;
-]
 {
     SID_HYPERLINK_DIALOG
     [
@@ -312,9 +309,6 @@ interface Window
 }
 
 interface BrowseWindow : Window
-[
-    Automation = FALSE ;
-]
 {
     SID_ACTIVATE // ole(no) api(final/play/rec)
     [
@@ -368,9 +362,6 @@ interface BrowseWindow : Window
 }
 
 interface TopWindow : BrowseWindow
-[
-    Automation = FALSE ;
-]
 {
     SID_NEWDOCDIRECT // ole(no) api(no)
     [
@@ -413,7 +404,7 @@ interface TopWindow : BrowseWindow
 
 shell SfxViewFrame
 {
-    import TopWindow [Automation];
+    import TopWindow;
 
     SID_FORMATMENUSTATE
     [
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index c8fdde1..9009270 100644
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
@@ -17,9 +17,6 @@
  */
 
 interface View
-[
-    Automation = FALSE ;
-]
 {
 
     SID_MAIL_SENDDOC // ole(no) api(todo)
@@ -97,5 +94,5 @@ interface View
 
 shell SfxViewShell
 {
-    import View [Automation];
+    import View;
 }
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index d00382d..e51e212 100644
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -47,7 +47,7 @@ StarMath
 
 shell SmModule
 {
-    import StarMath[Automation];
+    import StarMath;
 }
 
 interface FormulaDocument
@@ -142,7 +142,7 @@ interface FormulaDocument
 
 shell SmDocShell
 {
-    import FormulaDocument[Automation];
+    import FormulaDocument;
 }
 
 
@@ -315,7 +315,7 @@ interface FormulaView
 
 shell SmViewShell
 {
-    import FormulaView[Automation];
+    import FormulaView;
 }
 
 }
diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi
index 255fa88..e7b6ad9 100644
--- a/svx/sdi/fmslots.sdi
+++ b/svx/sdi/fmslots.sdi
@@ -627,7 +627,7 @@ interface FormTextAttributeShell
 shell FmFormShell
 {
     import FormTextAttributeShell;
-    import Form [Automation];
+    import Form;
 
     SID_FM_CONFIG // ole : no, status : ?
     [
diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index ec1f51c..141bc97 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -17,7 +17,6 @@
  */
 
 interface _Annotation
-[ Automation = FALSE; ]
 {
     FN_DELETE_COMMENT
     [
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index faf0834..ae883d1 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextSelection
-[
-    Automation = FALSE;
-]
 {
     SID_ATTR_BRUSH
     [
diff --git a/sw/sdi/_beziers.sdi b/sw/sdi/_beziers.sdi
index d89fad3..bf605ba 100644
--- a/sw/sdi/_beziers.sdi
+++ b/sw/sdi/_beziers.sdi
@@ -17,7 +17,6 @@
  */
 
 interface _Bezier : Base
-[ Automation = FALSE; ]
 {
     SID_DELETE
     [
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi
index 0fe5eb8..263dc15 100644
--- a/sw/sdi/_docsh.sdi
+++ b/sw/sdi/_docsh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextDocument
-[
-    Automation = FALSE;
-]
 {
     SID_PRINTPREVIEW
     [
diff --git a/sw/sdi/_drwbase.sdi b/sw/sdi/_drwbase.sdi
index 256eab7..e3a4715 100644
--- a/sw/sdi/_drwbase.sdi
+++ b/sw/sdi/_drwbase.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextDrawBase
-[
-    Automation = FALSE;
-]
 {
     FN_DRAW_WRAP_DLG
     [
diff --git a/sw/sdi/_formsh.sdi b/sw/sdi/_formsh.sdi
index 2965eb1..b0d6b33 100644
--- a/sw/sdi/_formsh.sdi
+++ b/sw/sdi/_formsh.sdi
@@ -16,9 +16,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 interface BaseTextDrawForm
-[
-    Automation = FALSE;
-]
 {
     SID_HYPERLINK_SETLINK
     [
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index b27a19b..7702fde 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextFrame
-[
-    Automation = FALSE;
-]
 {
     //UUUU
     SID_ATTR_FILL_STYLE
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index bb50bc9..bf8270c 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextGraphic
-[
-    Automation = FALSE;
-]
 {
     SID_FLIP_VERTICAL
     [
diff --git a/sw/sdi/_listsh.sdi b/sw/sdi/_listsh.sdi
index 0d3adcd..d55073b 100644
--- a/sw/sdi/_listsh.sdi
+++ b/sw/sdi/_listsh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextList
-[
-    Automation = FALSE
-]
 {
     FN_NUM_BULLET_DOWN // status(final|play)
     [
diff --git a/sw/sdi/_mediash.sdi b/sw/sdi/_mediash.sdi
index 497a245..5a17d0e 100644
--- a/sw/sdi/_mediash.sdi
+++ b/sw/sdi/_mediash.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextMedia
-[
-    Automation = FALSE;
-]
 {
     SID_DELETE
     [
diff --git a/sw/sdi/_navsh.sdi b/sw/sdi/_navsh.sdi
index 458e78c..5893647 100644
--- a/sw/sdi/_navsh.sdi
+++ b/sw/sdi/_navsh.sdi
@@ -8,7 +8,6 @@
  */
 
 interface _Navigation
-[ Automation = FALSE; ]
 {
     SfxVoidItem NavigateBack FN_NAVIGATION_BACK
     [
diff --git a/sw/sdi/_olesh.sdi b/sw/sdi/_olesh.sdi
index d1f7eb3..3712ade 100644
--- a/sw/sdi/_olesh.sdi
+++ b/sw/sdi/_olesh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextOLEObject
-[
-    Automation = FALSE;
-]
 {
 }
 
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 2508c2f..554de39 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextTable
-[
-    Automation = FALSE;
-]
 {
 
     FN_FORMAT_TABLE_DLG   // status(final|play)
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 0994e64..e98a173 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -16,9 +16,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 interface BaseText
-[
-    Automation = FALSE;
-]
 {
     FN_NEW_GLOSSARY // status(final|play)
     [
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 79579f0..ceb47a6 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface BaseTextEditView
-[
-    Automation = FALSE;
-]
 {
     FN_REFRESH_VIEW // status(final|play)
     [
diff --git a/sw/sdi/annotsh.sdi b/sw/sdi/annotsh.sdi
index f0a47dd..5617a5a 100644
--- a/sw/sdi/annotsh.sdi
+++ b/sw/sdi/annotsh.sdi
@@ -379,5 +379,5 @@ interface Annotation : _Annotation
 
 shell SwAnnotationShell
 {
-    import Annotation[Automation];
+    import Annotation;
 }
diff --git a/sw/sdi/basesh.sdi b/sw/sdi/basesh.sdi
index 9c61e41..4767071 100644
--- a/sw/sdi/basesh.sdi
+++ b/sw/sdi/basesh.sdi
@@ -49,6 +49,6 @@ interface TextSelection : BaseTextSelection
 
 shell SwBaseShell
 {
-        import TextSelection[Automation];
+        import TextSelection;
 }
 
diff --git a/sw/sdi/beziersh.sdi b/sw/sdi/beziersh.sdi
index d32fc20..88d5071 100644
--- a/sw/sdi/beziersh.sdi
+++ b/sw/sdi/beziersh.sdi
@@ -120,6 +120,6 @@ interface TextBezier : TextSelection
 
 shell SwBezierShell: SwBaseShell
 {
-    import TextBezier[Automation];
+    import TextBezier;
 }
 
diff --git a/sw/sdi/docsh.sdi b/sw/sdi/docsh.sdi
index 9085bdf..64c3cb9 100644
--- a/sw/sdi/docsh.sdi
+++ b/sw/sdi/docsh.sdi
@@ -63,12 +63,12 @@ interface TextDocument : BaseTextDocument
 
 shell SwDocShell
 {
-    import TextDocument[Automation];
+    import TextDocument;
 }
 
 shell SwGlosDocShell : SwDocShell
 {
-    import TextDocument[Automation];
+    import TextDocument;
 
     SID_SAVEDOC  // status()
     [
diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi
index 5b2b27a..5b9c668 100644
--- a/sw/sdi/drawsh.sdi
+++ b/sw/sdi/drawsh.sdi
@@ -408,7 +408,7 @@ interface TextDraw : TextDrawBase
 
 shell SwDrawShell : SwDrawBaseShell
 {
-        import TextDraw [Automation];
+        import TextDraw;
 
      // no export
 
diff --git a/sw/sdi/drwbassh.sdi b/sw/sdi/drwbassh.sdi
index 0ca9508..7a950db 100644
--- a/sw/sdi/drwbassh.sdi
+++ b/sw/sdi/drwbassh.sdi
@@ -17,16 +17,13 @@
  */
 
 interface TextDrawBase : BaseTextDrawBase
-[
-    Automation = FALSE;
-]
 {
     import TextSelection;
 }
 
 shell SwDrawBaseShell: SwBaseShell
 {
-        import TextDrawBase[Automation];
+        import TextDrawBase;
         import Sidebar;
 
     SID_OBJECT_ALIGN
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index b45aad5..b6f13fc 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -710,7 +710,7 @@ interface TextDrawFont
 
 shell SwDrawTextShell
 {
-        import TextDrawText[Automation];
+        import TextDrawText;
         import TextDrawFont ".DrawFont";
 }
 
diff --git a/sw/sdi/formsh.sdi b/sw/sdi/formsh.sdi
index 9f57352..92eb2b7 100644
--- a/sw/sdi/formsh.sdi
+++ b/sw/sdi/formsh.sdi
@@ -25,6 +25,6 @@ interface TextDrawForm: BaseTextDrawForm
 
 shell SwDrawFormShell : SwDrawBaseShell
 {
-    import TextDrawForm[Automation];
+    import TextDrawForm;
 }
 
diff --git a/sw/sdi/frmsh.sdi b/sw/sdi/frmsh.sdi
index bf76bce..4e7b06b 100644
--- a/sw/sdi/frmsh.sdi
+++ b/sw/sdi/frmsh.sdi
@@ -26,7 +26,7 @@ interface TextFrame : BaseTextFrame
 
 shell SwFrameShell : SwBaseShell
 {
-    import TextFrame[Automation];
+    import TextFrame;
 
     FN_FRAME_CHAIN
     [
diff --git a/sw/sdi/grfsh.sdi b/sw/sdi/grfsh.sdi
index de22469..f289b97 100644
--- a/sw/sdi/grfsh.sdi
+++ b/sw/sdi/grfsh.sdi
@@ -26,6 +26,6 @@ interface TextGraphic : BaseTextGraphic
 shell SwGrfShell : SwBaseShell
 
 {
-    import TextGraphic[Automation];
+    import TextGraphic;
 }
 
diff --git a/sw/sdi/listsh.sdi b/sw/sdi/listsh.sdi
index 6b08e97..9148277 100644
--- a/sw/sdi/listsh.sdi
+++ b/sw/sdi/listsh.sdi
@@ -26,6 +26,6 @@ interface TextList : BaseTextList
 
 shell SwListShell : SwBaseShell
 {
-        import TextList[Automation];
+        import TextList;
 }
 
diff --git a/sw/sdi/mediash.sdi b/sw/sdi/mediash.sdi
index 679ad5a..0409dc2 100644
--- a/sw/sdi/mediash.sdi
+++ b/sw/sdi/mediash.sdi
@@ -26,5 +26,5 @@ interface TextMedia : BaseTextMedia
 shell SwMediaShell : SwBaseShell
 
 {
-    import TextMedia[Automation];
+    import TextMedia;
 }
diff --git a/sw/sdi/navsh.sdi b/sw/sdi/navsh.sdi
index 14dc55f..36de346 100644
--- a/sw/sdi/navsh.sdi
+++ b/sw/sdi/navsh.sdi
@@ -9,7 +9,7 @@
 
 shell SwNavigationShell
 {
-    import _Navigation[Automation];
+    import _Navigation;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/sdi/olesh.sdi b/sw/sdi/olesh.sdi
index 564beb7..744e631 100644
--- a/sw/sdi/olesh.sdi
+++ b/sw/sdi/olesh.sdi
@@ -26,6 +26,6 @@ interface TextOLEObject : BaseTextOLEObject
 
 shell SwOleShell: SwFrameShell
 {
-    import TextOLEObject[Automation];
+    import TextOLEObject;
 }
 
diff --git a/sw/sdi/sidebar.sdi b/sw/sdi/sidebar.sdi
index e23a88c..fff1ae2 100644
--- a/sw/sdi/sidebar.sdi
+++ b/sw/sdi/sidebar.sdi
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-interface Sidebar [ Automation = FALSE; ]
+interface Sidebar
 {
     SID_ATTR_TRANSFORM_WIDTH    [ StateMethod = GetDrawAttrStateForIFBX; ]
     SID_ATTR_TRANSFORM_HEIGHT   [ StateMethod = GetDrawAttrStateForIFBX; ]
diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index 4df069e..120c219 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -51,6 +51,6 @@ interface TextTable : BaseTextTable
 shell SwTableShell : SwBaseShell
 
 {
-        import TextTable[Automation];
+        import TextTable;
 }
 
diff --git a/sw/sdi/textsh.sdi b/sw/sdi/textsh.sdi
index dc6677e..b85f0df 100644
--- a/sw/sdi/textsh.sdi
+++ b/sw/sdi/textsh.sdi
@@ -89,6 +89,6 @@ enum TOXTypes
 
 shell SwTextShell : SwBaseShell
 {
-    import Text[Automation];
+    import Text;
 }
 
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 15f3f2a..80cafa8 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -203,7 +203,7 @@ interface TextEditView : BaseTextEditView
 shell SwView
 
 {
-    import TextEditView [Automation];
+    import TextEditView;
 //  import TextPage "Page";
 //  import SearchSettings;
 //  import SearchAttributes;
@@ -392,6 +392,6 @@ interface TextPrintPreview
 
 shell SwPagePreview
 {
-    import TextPrintPreview[Automation];
+    import TextPrintPreview;
 }
 
diff --git a/sw/sdi/wbasesh.sdi b/sw/sdi/wbasesh.sdi
index 43f1fac..3099817 100644
--- a/sw/sdi/wbasesh.sdi
+++ b/sw/sdi/wbasesh.sdi
@@ -17,9 +17,6 @@
  */
 
 interface WebSelection : BaseTextSelection
-[
-    Automation = FALSE;
-]
 {
     // hier kommt nur dann etwas hinein, wenn es im
     // kompletten StarWriter nicht benoetigt wird
@@ -27,7 +24,7 @@ interface WebSelection : BaseTextSelection
 
 shell SwWebBaseShell
 {
-        import WebSelection[Automation];
+        import WebSelection;
         import Interior "Interior";
         import Shadow "Shadow";
 
diff --git a/sw/sdi/wbeziers.sdi b/sw/sdi/wbeziers.sdi
index 28393c2..613a0243 100644
--- a/sw/sdi/wbeziers.sdi
+++ b/sw/sdi/wbeziers.sdi
@@ -23,6 +23,6 @@ interface Bezier : _Bezier
 
 shell SwBezierShell: SwBaseShell
 {
-    import Bezier[Automation];
+    import Bezier;
 }
 
diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi
index f3d62b9..d76a2ee 100644
--- a/sw/sdi/wdocsh.sdi
+++ b/sw/sdi/wdocsh.sdi
@@ -37,7 +37,7 @@ interface WebDocument : BaseTextDocument
 
 shell SwWebDocShell
 {
-        import WebDocument[Automation];
+        import WebDocument;
 }
 
 shell SwWebGlosDocShell : SwWebDocShell
diff --git a/sw/sdi/wdrwbase.sdi b/sw/sdi/wdrwbase.sdi
index f120799..adf752d 100644
--- a/sw/sdi/wdrwbase.sdi
+++ b/sw/sdi/wdrwbase.sdi
@@ -17,16 +17,13 @@
  */
 
 interface WebDrawBase : BaseTextDrawBase
-[
-    Automation = FALSE;
-]
 {
     import BaseTextSelection;
 }
 
 shell SwWebDrawBaseShell: SwBaseShell
 {
-        import WebDrawBase[Automation];
+        import WebDrawBase;
         import Sidebar;
 
     SID_OBJECT_ALIGN
diff --git a/sw/sdi/wformsh.sdi b/sw/sdi/wformsh.sdi
index 7b3d630..84584b4 100644
--- a/sw/sdi/wformsh.sdi
+++ b/sw/sdi/wformsh.sdi
@@ -25,6 +25,6 @@ interface WebDrawForm: BaseTextDrawForm
 
 shell SwWebDrawFormShell : SwWebDrawBaseShell
 {
-    import WebDrawForm[Automation];
+    import WebDrawForm;
 }
 
diff --git a/sw/sdi/wfrmsh.sdi b/sw/sdi/wfrmsh.sdi
index bd8b1bd..03c5117 100644
--- a/sw/sdi/wfrmsh.sdi
+++ b/sw/sdi/wfrmsh.sdi
@@ -26,6 +26,6 @@ interface WebFrame : BaseTextFrame
 
 shell SwWebFrameShell : SwBaseShell
 {
-        import WebFrame[Automation];
+        import WebFrame;
 }
 
diff --git a/sw/sdi/wgrfsh.sdi b/sw/sdi/wgrfsh.sdi
index 4f446a1..673782c 100644
--- a/sw/sdi/wgrfsh.sdi
+++ b/sw/sdi/wgrfsh.sdi
@@ -25,6 +25,6 @@ interface WebGraphic : BaseTextGraphic
 
 shell SwWebGrfShell : SwBaseShell
 {
-        import WebGraphic[Automation];
+        import WebGraphic;
 }
 
diff --git a/sw/sdi/wlistsh.sdi b/sw/sdi/wlistsh.sdi
index 1cdda57..85d66b0 100644
--- a/sw/sdi/wlistsh.sdi
+++ b/sw/sdi/wlistsh.sdi
@@ -25,6 +25,6 @@ interface WebList : BaseTextList
 
 shell SwWebListShell : SwBaseShell
 {
-        import WebList[Automation];
+        import WebList;
 }
 
diff --git a/sw/sdi/wolesh.sdi b/sw/sdi/wolesh.sdi
index 840003d..2955081 100644
--- a/sw/sdi/wolesh.sdi
+++ b/sw/sdi/wolesh.sdi
@@ -25,6 +25,6 @@ interface WebOLEObject : BaseTextOLEObject
 
 shell SwWebOleShell : SwWebFrameShell
 {
-        import WebOLEObject[Automation];
+        import WebOLEObject;
 }
 
diff --git a/sw/sdi/wrtapp.sdi b/sw/sdi/wrtapp.sdi
index f076b45..f32a7e2 100644
--- a/sw/sdi/wrtapp.sdi
+++ b/sw/sdi/wrtapp.sdi
@@ -75,6 +75,6 @@ interface StarWriter
 
 shell SwModule
 {
-    import StarWriter[Automation];
+    import StarWriter;
 }
 
diff --git a/sw/sdi/wtabsh.sdi b/sw/sdi/wtabsh.sdi
index 1eef64c..9d23729 100644
--- a/sw/sdi/wtabsh.sdi
+++ b/sw/sdi/wtabsh.sdi
@@ -24,6 +24,6 @@ interface WebTable : BaseTextTable
 
 shell SwWebTableShell : SwBaseShell
 {
-        import WebTable[Automation];
+        import WebTable;
 }
 
diff --git a/sw/sdi/wtextsh.sdi b/sw/sdi/wtextsh.sdi
index 309c48a..4a843b0 100644
--- a/sw/sdi/wtextsh.sdi
+++ b/sw/sdi/wtextsh.sdi
@@ -34,6 +34,6 @@ interface WebText : BaseText
 
 shell SwWebTextShell : SwBaseShell
 {
-    import WebText[Automation];
+    import WebText;
 }
 
diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi
index 704050f..2e634bc 100644
--- a/sw/sdi/wviewsh.sdi
+++ b/sw/sdi/wviewsh.sdi
@@ -53,7 +53,7 @@ interface WebEditView : BaseTextEditView
 
 shell SwWebView
 {
-    import WebEditView [Automation];
+    import WebEditView;
 //  import SearchSettings;
 //  import TextPage "Page";
 //  import SearchAttributes;
@@ -190,6 +190,6 @@ interface WebSourceView
 shell SwSrcView
 
 {
-        import WebSourceView [Automation];
+        import WebSourceView;
 }
 


More information about the Libreoffice-commits mailing list