methods in .SDI files don't use attributes

so simplify the parser and drop the square brackets

Change-Id: I3bab5f5b14e57d0cd1ed1a383fe21968f97b243a

5 files changed, 23 insertions, 43 deletions

diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index f9e2f0f8c53e..dc3340a214b8 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -397,31 +397,25 @@ void SvIdlParser::ReadInterfaceOrShellMethodOrAttribute( SvMetaAttribute& rAttr
         throw SvParseException( rInStm, "no value for identifier <" + rAttr.aSlotId.getString() + "> " );
     rAttr.aSlotId.SetValue(n);
 
-    if( ReadIf( '(' ) )
+    Read( '(' );
+    // read method arguments
+    tools::SvRef<SvMetaType> xT(new SvMetaType() );
+    xT->SetRef(rAttr.GetType() );
+    rAttr.aType = xT;
+    sal_uInt32 nBeginPos = 0; // can not happen with Tell
+    while( nBeginPos != rInStm.Tell() )
     {
-        // read method arguments
-        tools::SvRef<SvMetaType> xT(new SvMetaType() );
-        xT->SetRef(rAttr.GetType() );
-        rAttr.aType = xT;
-        sal_uInt32 nBeginPos = 0; // can not happen with Tell
-        while( nBeginPos != rInStm.Tell() )
+        nBeginPos = rInStm.Tell();
+        tools::SvRef<SvMetaAttribute> xAttr( new SvMetaAttribute() );
+        if( xAttr->ReadSvIdl( rBase, rInStm ) )
         {
-            nBeginPos = rInStm.Tell();
-            tools::SvRef<SvMetaAttribute> xAttr( new SvMetaAttribute() );
-            if( xAttr->ReadSvIdl( rBase, rInStm ) )
-            {
-                if( xAttr->Test( rInStm ) )
-                    rAttr.aType->GetAttrList().push_back( xAttr );
-            }
-            ReadIfDelimiter();
+            if( xAttr->Test( rInStm ) )
+                rAttr.aType->GetAttrList().push_back( xAttr );
         }
-        Read( ')' );
-        rAttr.aType->SetType( MetaTypeType::Method );
-    }
-    if( ReadIf( '[' ) )
-    {
-        Read( ']' );
+        ReadIfDelimiter();
     }
+    Read( ')' );
+    rAttr.aType->SetType( MetaTypeType::Method );
 }
 
 SvMetaClass * SvIdlParser::ReadKnownClass()
diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi
index 6964d6b35674..25852fb8472a 100644
--- a/sc/sdi/docsh.sdi
+++ b/sc/sdi/docsh.sdi
@@ -29,11 +29,7 @@ interface TableSelection
         INT16   Column      SID_SC_CELLS,
         INT32   Row         FN_PARAM_1
     )
-    [
-    ]
-    UINT16 Index FID_TAB_INDEX
-    [
-    ]
+    UINT16 Index FID_TAB_INDEX ()
     FID_PROTECT_TABLE       [ ExecMethod = Execute; StateMethod = GetState; ]
     FID_PROTECT_DOC         [ ExecMethod = Execute; StateMethod = GetState; ]
 
diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi
index 782f99b39b33..2c90f60e9855 100644
--- a/sc/sdi/formatsh.sdi
+++ b/sc/sdi/formatsh.sdi
@@ -39,12 +39,8 @@ interface TableFont
 interface FormatForSelection
 {
     //Auch das Basic muss wieder laufen
-    SbxObject Font SID_PROP_FONT
-    [
-    ]
-    SbxObject Interior SID_PROP_INTERIOR // status(Final)
-    [
-    ]
+    SbxObject Font SID_PROP_FONT ()
+    SbxObject Interior SID_PROP_INTERIOR () // status(Final)
 
     // Slot's die in der DrawShell disabled werden. {
     SID_STYLE_FAMILY2           [ ExecMethod = ExecuteStyle; StateMethod = GetStyleState; ]
diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 3a25e81a7b1d..43a8e58dbf04 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -212,7 +212,7 @@ interface DataPilotTables
 
 interface DataPilotTable
 {
-    SbxObject DataPilotFields SID_PIVOT_FIELDS
+    SbxObject DataPilotFields SID_PIVOT_FIELDS ()
 }
 
 interface DataPilotFields
@@ -221,9 +221,9 @@ interface DataPilotFields
 
 interface DataPilotField
 {
-    String FieldName SID_PFIELD_NAME
-    UINT16 Orientation SID_PFIELD_ORIENTATION
-    UINT16 Function SID_PFIELD_FUNCTION
+    String FieldName SID_PFIELD_NAME ()
+    UINT16 Orientation SID_PFIELD_ORIENTATION ()
+    UINT16 Function SID_PFIELD_FUNCTION ()
 }
 
 
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 7aed0a13ee1b..183f752977eb 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -806,24 +806,18 @@ interface GlobalContents
     (
         UINT16  Position        FN_COLL_TYPE
     )
-    [
-    ]
 
     // Areaname, Index-Titel or Empty String
     String  Title FN_COLL_TITLE
     (
         UINT16  Position        FN_COLL_TITLE
     )
-    [
-    ]
+
     // Without a FileName an area of the text is inserted at this location.
     BOOL    InsertDocument  FN_COLL_ADD
     (
         UINT16  Position        FN_COLL_ADD,
         UINT16  FileName        FN_PARAM_1
     )
-    [
-    ]
-
 }