diff options
| -rw-r--r-- | idl/inc/parser.hxx | 2 | ||||
| -rw-r--r-- | idl/source/prj/parser.cxx | 13 | ||||
| -rw-r--r-- | sc/sdi/cellsh.sdi | 3 | ||||
| -rw-r--r-- | sc/sdi/docsh.sdi | 1 |
4 files changed, 8 insertions, 11 deletions
diff --git a/idl/inc/parser.hxx b/idl/inc/parser.hxx index 78a62af53ca1..8059cfdd9dd5 100644 --- a/idl/inc/parser.hxx +++ b/idl/inc/parser.hxx @@ -45,7 +45,7 @@ public: void ReadInterfaceOrShell( SvMetaModule& rModule, MetaTypeType aMetaTypeType ); void ReadInterfaceOrShellEntry( SvMetaClass& rClass ); bool ReadInterfaceOrShellSlot( SvMetaSlot& rSlot ); - bool ReadInterfaceOrShellAttribute( SvMetaAttribute& rAttr ); + bool ReadInterfaceOrShellMethodOrAttribute( SvMetaAttribute& rAttr ); void ReadItem(); void ReadStruct(); void ReadEnum(); diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx index 777359859b50..9d77a3682c5a 100644 --- a/idl/source/prj/parser.cxx +++ b/idl/source/prj/parser.cxx @@ -338,7 +338,7 @@ void SvIdlParser::ReadInterfaceOrShellEntry(SvMetaClass& rClass) else { xAttr = new SvMetaAttribute( pType ); - bOk = ReadInterfaceOrShellAttribute(*xAttr); + bOk = ReadInterfaceOrShellMethodOrAttribute(*xAttr); } if( bOk ) bOk = xAttr->Test( rInStm ); @@ -392,20 +392,21 @@ bool SvIdlParser::ReadInterfaceOrShellSlot(SvMetaSlot& rSlot) return bOk; } -bool SvIdlParser::ReadInterfaceOrShellAttribute( SvMetaAttribute& rAttr ) +bool SvIdlParser::ReadInterfaceOrShellMethodOrAttribute( SvMetaAttribute& rAttr ) { sal_uInt32 nTokPos = rInStm.Tell(); bool bOk = false; rAttr.SetName( ReadIdentifier() ); - rAttr.aSlotId.ReadSvIdl( rBase, rInStm ); + rAttr.aSlotId.setString( ReadIdentifier() ); + sal_uLong n; + if( !rBase.FindId( rAttr.aSlotId.getString(), &n ) ) + throw SvParseException( rInStm, "no value for identifier <" + rAttr.aSlotId.getString() + "> " ); + rAttr.aSlotId.SetValue(n); bOk = true; SvToken& rTok = rInStm.GetToken(); if( rTok.IsChar() && rTok.GetChar() == '(' ) { - tools::SvRef<SvMetaType> xT(new SvMetaType() ); - xT->SetRef(rAttr.GetType() ); - rAttr.aType = xT; bOk = rAttr.aType->ReadMethodArgs( rBase, rInStm ); } if( bOk && rInStm.ReadIf( '[' ) ) diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index 126c6f79ec3b..cf94574c44fc 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -19,9 +19,6 @@ interface CellSelection { - SbxObject Movement - [ - ] // Slot's die in der DrawShell disabled werden. { FID_DEFINE_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] FID_ADD_NAME [ ExecMethod = ExecuteEdit; StateMethod = GetState; ] diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi index d103ee7fb7d7..6964d6b35674 100644 --- a/sc/sdi/docsh.sdi +++ b/sc/sdi/docsh.sdi @@ -71,7 +71,6 @@ interface TableDocument SID_PIVOT_GET [ StateMethod = GetSbxState; ] SID_SC_ACTIVEOBJECT [ StateMethod = GetDrawObjState; ] SID_ATTR_YEAR2000 [ StateMethod = GetState; ExecMethod = Execute; ] - SbxObject OLEObjects [] SID_CHART_SOURCE [ ExecMethod = Execute; ] SID_CHART_ADDSOURCE [ ExecMethod = Execute; ] FID_AUTO_CALC [ ExecMethod = Execute; StateMethod = GetState; ] |