diff options
54 files changed, 1 insertions, 357 deletions
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi index 40472c039c5b..e61f737e0e14 100644 --- a/basctl/sdi/baside.sdi +++ b/basctl/sdi/baside.sdi @@ -17,9 +17,6 @@ */ interface BasicIDEView -[ - uuid = "D88DF7A2-EE63-11d0-89CA-008029E4B0B1"; -] { } @@ -508,9 +505,6 @@ shell basctl_Shell } interface BasicIDEDocument -[ - uuid = "D88DF7A1-EE63-11d0-89CA-008029E4B0B1"; -] { } 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) diff --git a/sc/sdi/app.sdi b/sc/sdi/app.sdi index a61c68497fab..d8f2dcea4fdb 100644 --- a/sc/sdi/app.sdi +++ b/sc/sdi/app.sdi @@ -17,9 +17,6 @@ */ interface StarCalc -[ - uuid ( "AB3257C0-07D7-11CF-89CB-008029E4B0B1" ) -] { FID_AUTOCOMPLETE [ ExecMethod = Execute; StateMethod = GetState; ] SID_DETECTIVE_AUTO [ ExecMethod = Execute; StateMethod = GetState; ] diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index 1f1058a54b8f..126c6f79ec3b 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -18,9 +18,6 @@ interface CellSelection -[ - uuid ( "D7680520-137B-11D3-B25B-006097DA68F3" ) -] { SbxObject Movement [ @@ -242,9 +239,6 @@ interface CellSelection interface CellMovement -[ - uuid ( "FF2E35C0-137B-11D3-B25B-006097DA68F3" ) -] { SID_NEXT_TABLE [ @@ -421,9 +415,6 @@ interface CellMovement interface RangeSelection -[ - uuid ( "0CAB4620-137C-11D3-B25B-006097DA68F3" ) -] { import CellSelection; import FormatForSelection; @@ -432,9 +423,6 @@ interface RangeSelection } interface Cell -[ - uuid ( "F0645A00-1921-11D3-B25B-006097DA68F3" ) -] { import CellSelection; import CellMovement; diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi index ab22bbf4a8d9..d103ee7fb7d7 100644 --- a/sc/sdi/docsh.sdi +++ b/sc/sdi/docsh.sdi @@ -18,9 +18,6 @@ interface TableSelection -[ - uuid = "BA338A41-064E-11d0-89CB-008029E4B0B1" ; -] { SID_DELETE_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] SID_OPENDLG_EDIT_PRINTAREA [ ExecMethod = Execute; StateMethod = GetState; ] @@ -59,9 +56,6 @@ interface TableSelection interface TableDocument -[ - uuid = "BA338A42-064E-11d0-89CB-008029E4B0B1" ; -] { SID_OPEN_CALC [ ExecMethod = Execute; StateMethod = GetState; ] SID_SBA_IMPORT [ ExecMethod = Execute; StateMethod = GetState; ] @@ -77,10 +71,7 @@ interface TableDocument SID_PIVOT_GET [ StateMethod = GetSbxState; ] SID_SC_ACTIVEOBJECT [ StateMethod = GetDrawObjState; ] SID_ATTR_YEAR2000 [ StateMethod = GetState; ExecMethod = Execute; ] - SbxObject OLEObjects - [ - IsCollection ; - ] + SbxObject OLEObjects [] SID_CHART_SOURCE [ ExecMethod = Execute; ] SID_CHART_ADDSOURCE [ ExecMethod = Execute; ] FID_AUTO_CALC [ ExecMethod = Execute; StateMethod = GetState; ] @@ -106,9 +97,6 @@ interface TableDocument shell ScDocShell -[ - uuid ( "3F543FA0-B6A6-101B-9961-04021C007002" ) -] { import TableDocument; } diff --git a/sc/sdi/formatsh.sdi b/sc/sdi/formatsh.sdi index 8846b505207f..782f99b39b33 100644 --- a/sc/sdi/formatsh.sdi +++ b/sc/sdi/formatsh.sdi @@ -18,9 +18,6 @@ interface TableFont -[ - uuid ( "2E4AC1C0-137C-11D3-B25B-006097DA68F3" ) -] { SID_ATTR_CHAR_FONT [ ExecMethod = ExecuteAttr; StateMethod = GetAttrState; ] SID_ATTR_CHAR_PREVIEW_FONT [ ExecMethod = ExecuteAttr; ] @@ -40,9 +37,6 @@ interface TableFont interface FormatForSelection -[ - uuid ( "40F448A0-137C-11D3-B25B-006097DA68F3" ) -] { //Auch das Basic muss wieder laufen SbxObject Font SID_PROP_FONT diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index b73886b02a74..7a08418357b1 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -19,9 +19,6 @@ interface TableOLEObject -[ - uuid ( "C04AA960-137B-11D3-B25B-006097DA68F3" ) -] { SID_ACTIVE_OBJ_NAME [ StateMethod = GetObjectState; ] SID_OLE_OBJECT [ StateMethod = GetObjectState; ] @@ -36,9 +33,6 @@ interface TableOLEObject interface Tables -[ - uuid = "5692EFC0-355B-11cf-89CB-008029E4B0B1" ; -] { FID_TAB_SELECTALL [ ExecMethod = Execute; StateMethod = GetState; ] FID_TAB_DESELECTALL [ ExecMethod = Execute; StateMethod = GetState; ] @@ -55,9 +49,6 @@ interface Tables interface BaseSelection -[ - uuid = "02ABE040-137B-11D3-B25B-006097DA68F3" ; -] { // Einfuegen von Objekten { @@ -132,9 +123,6 @@ interface BaseSelection } interface TableEditView -[ - uuid ( "16D7E4A0-2FB4-11CF-89CB-008029E4B0B1" ) -] { SbxObject SearchSettings [ @@ -230,32 +218,20 @@ interface TableEditView interface DataPilotTables -[ - uuid ( "86DB0400-4EE6-11d1-89CB-008029E4B0B1" ) -] { } interface DataPilotTable -[ - uuid ( "E8DBA2C1-4C5E-11d1-89CB-008029E4B0B1" ) -] { SbxObject DataPilotFields SID_PIVOT_FIELDS [ HelpText = "" ; ] } interface DataPilotFields -[ - uuid ( "BA09AF20-4C70-11d1-89CB-008029E4B0B1" ) -] { } interface DataPilotField -[ - uuid ( "D2C2C540-4C8B-11d1-89CB-008029E4B0B1" ) -] { String FieldName SID_PFIELD_NAME [ HelpText = "" ; ] diff --git a/sd/sdi/app.sdi b/sd/sdi/app.sdi index e4e10d652007..b2f6e16a4574 100644 --- a/sd/sdi/app.sdi +++ b/sd/sdi/app.sdi @@ -17,9 +17,6 @@ */ interface StarImpress -[ - uuid ( "A1814AE0-07D4-11CF-89CA-008029E4B0B1" ) -] { SID_NEWDOC // ole : ?, status : ? [ diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi index 89a2766c90f4..d2a0011944ca 100644 --- a/sd/sdi/docshell.sdi +++ b/sd/sdi/docshell.sdi @@ -17,9 +17,6 @@ */ interface ImpressDocument : DrawDocument -[ - uuid ( "D8E15AE0-2FB4-11CF-89CA-008029E4B0B1" ) ; -] { } diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi index 3ec71655ff51..0ae6eea22062 100644 --- a/sd/sdi/drviewsh.sdi +++ b/sd/sdi/drviewsh.sdi @@ -16,9 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ interface ImpressEditView : DrawView -[ - uuid ( "661B07E0-2FB4-11CF-89CA-008029E4B0B1" ) ; -] { SID_MODIFYPAGE // ole : no, status : play rec [ diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi index 892edfadf35a..961a4c6051bf 100644 --- a/sd/sdi/grdocsh.sdi +++ b/sd/sdi/grdocsh.sdi @@ -17,9 +17,6 @@ */ interface GraphicDocument : DrawDocument -[ - uuid ( "D7474100-ACDF-11D0-89CB-008029E4B0B1" ) ; // created at 04.04.97 -] { } diff --git a/sd/sdi/grviewsh.sdi b/sd/sdi/grviewsh.sdi index 3938b7089254..df765f3c62ee 100644 --- a/sd/sdi/grviewsh.sdi +++ b/sd/sdi/grviewsh.sdi @@ -17,9 +17,6 @@ */ interface GraphicEditView : DrawView -[ - uuid ( "95F11180-ACE0-11D0-89CA-008029E4B0B1" ) ; -] { SID_SEARCH_OPTIONS // ole : ?, status : ? [ diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index d94914c4d46a..535f196df168 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -17,9 +17,6 @@ */ interface OutlineView -[ - uuid ( "92E2F580-2FB4-11CF-89CA-008029E4B0B1" ) ; -] { SID_CUT // ole : no, status : ? [ diff --git a/sfx2/sdi/docslots.sdi b/sfx2/sdi/docslots.sdi index 4eb54f91e6a9..73e1e4d790bd 100644 --- a/sfx2/sdi/docslots.sdi +++ b/sfx2/sdi/docslots.sdi @@ -17,9 +17,6 @@ */ interface Documents -[ - uuid = "61753B60-1114-101D-B8ED-3273768855A7" ; -] { SID_NEWDOC // ole(opt) api(final/play/rec) [ diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index e51e212206f9..f32d26f2d151 100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi @@ -35,9 +35,6 @@ StarMath include "svx.sdi" include "smath.sdi" interface StarMath - [ - uuid ( "92B0FD20-2FC1-11CF-89CA-008029E4B0B1" ) - ] { SID_CONFIGEVENT //idlpp ole : no , status : no [ @@ -51,9 +48,6 @@ shell SmModule } interface FormulaDocument -[ - uuid ( "815CBB20-2FC3-11CF-89CA-008029E4B0B1" ) -] { SID_DOCTEMPLATE //idlpp ole : no , status : no [ @@ -147,9 +141,6 @@ shell SmDocShell interface FormulaView -[ - uuid ( "CE1A6C00-2FC3-11CF-89CA-008029E4B0B1" ) -] { SID_FORMULACURSOR [ diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi index e7b6ad9c891b..beb700e54b4a 100644 --- a/svx/sdi/fmslots.sdi +++ b/svx/sdi/fmslots.sdi @@ -17,9 +17,6 @@ */ interface Form -[ - uuid = "F38D29A3-9EDA-11d1-AAF5-00A0248A7FBC" -] { SID_FM_CONFIG // ole : no, status : ? [ diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi index 35d117c8ff7e..d29b2a314fd9 100644 --- a/svx/sdi/svxslots.sdi +++ b/svx/sdi/svxslots.sdi @@ -34,9 +34,6 @@ SlotIdFile( "svxslots.hrc" ) include "fmslots.sdi" /* interface SearchSettings: Object - [ - uuid = "19B54420-184C-101D-B8ED-3273768855A7"; - ] { SID_SEARCH_ITEM [ @@ -46,9 +43,6 @@ SlotIdFile( "svxslots.hrc" ) } interface Interior : Object - [ - uuid ( "6CFA4FC0-608E-11cf-89CB-008029E4B0B1" ) - ] { SID_ATTR_BRUSH // status(final|play) [ @@ -58,9 +52,6 @@ SlotIdFile( "svxslots.hrc" ) } interface OLEObjects : Collection - [ - uuid = "BA338A43-064E-11d0-89CB-008029E4B0B1" ; - ] { } */ diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index ceb47a6e26ac..ab835f50d7fe 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -802,7 +802,6 @@ interface BaseTextEditView } interface GlobalContents -[ uuid = "1FD80520-F517-11d0-AC9B-008029E867C6"; ] { UINT16 Type FN_COLL_TYPE ( diff --git a/sw/sdi/annotsh.sdi b/sw/sdi/annotsh.sdi index 5617a5a35cd4..fbefb5e5e127 100644 --- a/sw/sdi/annotsh.sdi +++ b/sw/sdi/annotsh.sdi @@ -17,9 +17,6 @@ */ interface Annotation : _Annotation -[ - uuid = "CA0C4280-293D-11D1-89CB-008029E4B0B1" -] { SID_THESAURUS // api: diff --git a/sw/sdi/basesh.sdi b/sw/sdi/basesh.sdi index 476707144fef..df3ff961a685 100644 --- a/sw/sdi/basesh.sdi +++ b/sw/sdi/basesh.sdi @@ -17,9 +17,6 @@ */ interface TextSelection : BaseTextSelection -[ - uuid = "F23BA0A8-73A0-11d0-89CA-008029E4B0B1" -] { // Here shall the slots are inserted which are not supported by // StarWriter/WEB diff --git a/sw/sdi/beziersh.sdi b/sw/sdi/beziersh.sdi index 88d5071a883e..f9549fb89904 100644 --- a/sw/sdi/beziersh.sdi +++ b/sw/sdi/beziersh.sdi @@ -17,8 +17,6 @@ */ interface TextBezier : TextSelection -[ - uuid = "68EF7EA0-6876-11D0-A887-008029E86826" ] { SID_DELETE [ diff --git a/sw/sdi/docsh.sdi b/sw/sdi/docsh.sdi index 64c3cb9b0bb7..17132216de71 100644 --- a/sw/sdi/docsh.sdi +++ b/sw/sdi/docsh.sdi @@ -17,9 +17,6 @@ */ interface TextDocument : BaseTextDocument -[ - uuid = "0D960120-111C-101D-9757-6E74207A7520" -] { // Slots, which are not needed in the WebDocShell diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi index 5b9c6680abf1..81fdbf8fd225 100644 --- a/sw/sdi/drawsh.sdi +++ b/sw/sdi/drawsh.sdi @@ -16,9 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ interface TextDraw : TextDrawBase -[ - uuid = "626DE480-111A-101D-9757-6E74207A7520" -] { SID_ATTR_LINEEND_STYLE [ diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi index b6f13fcc2aeb..bc056678ff32 100644 --- a/sw/sdi/drwtxtsh.sdi +++ b/sw/sdi/drwtxtsh.sdi @@ -17,9 +17,6 @@ */ interface TextDrawText -[ - uuid = "CA0C4280-293D-11D1-89CB-008029E4B0B1" -] { SID_SELECTALL // api: [ @@ -634,7 +631,6 @@ interface TextDrawText } interface TextDrawFont -[ uuid = "074C35E0-11EF-101D-9757-6E74207A7520"; ] { SID_ATTR_CHAR_FONT // status() [ diff --git a/sw/sdi/formsh.sdi b/sw/sdi/formsh.sdi index 92eb2b79e128..348fc59f6593 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 TextDrawForm: BaseTextDrawForm -[ - uuid = "1D396B40-B8CC-11d1-AB80-006097B418C2" -] { import TextDrawBase; } diff --git a/sw/sdi/frmsh.sdi b/sw/sdi/frmsh.sdi index 4e7b06bb8a5e..73f8af14341d 100644 --- a/sw/sdi/frmsh.sdi +++ b/sw/sdi/frmsh.sdi @@ -17,9 +17,6 @@ */ interface TextFrame : BaseTextFrame -[ - uuid = "564CBAA0-111A-101D-9757-6E74207A7520" -] { import TextSelection; } diff --git a/sw/sdi/grfsh.sdi b/sw/sdi/grfsh.sdi index f289b97c5f3b..956a0c82b443 100644 --- a/sw/sdi/grfsh.sdi +++ b/sw/sdi/grfsh.sdi @@ -17,9 +17,6 @@ */ interface TextGraphic : BaseTextGraphic -[ - uuid = "1885FE00-111C-101D-9757-6E74207A7520" -] { } diff --git a/sw/sdi/listsh.sdi b/sw/sdi/listsh.sdi index 91482776a08c..fb53d29b7b73 100644 --- a/sw/sdi/listsh.sdi +++ b/sw/sdi/listsh.sdi @@ -17,9 +17,6 @@ */ interface TextList : BaseTextList -[ - uuid = "509E9100-111A-101D-9757-6E74207A7520" -] { import TextSelection; } diff --git a/sw/sdi/mediash.sdi b/sw/sdi/mediash.sdi index 0409dc2716de..5944c4526268 100644 --- a/sw/sdi/mediash.sdi +++ b/sw/sdi/mediash.sdi @@ -17,9 +17,6 @@ */ interface TextMedia : BaseTextMedia -[ - uuid = "54268616-9970-4ad9-8798-280206fc160a" -] { } diff --git a/sw/sdi/olesh.sdi b/sw/sdi/olesh.sdi index 744e6317fba0..19c826c740a1 100644 --- a/sw/sdi/olesh.sdi +++ b/sw/sdi/olesh.sdi @@ -17,9 +17,6 @@ */ interface TextOLEObject : BaseTextOLEObject -[ - uuid = "B156B300-39FC-101D-9757-C667E8298000" -] { import TextFrame; } diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi index 120c219ec299..c229880ba65b 100644 --- a/sw/sdi/tabsh.sdi +++ b/sw/sdi/tabsh.sdi @@ -17,9 +17,6 @@ */ interface TextTable : BaseTextTable -[ - uuid = "49CE7CA0-111A-101D-9757-6E74207A7520" -] { // Here should the slots be integrated, which are not supported // in StarWriter/WEB diff --git a/sw/sdi/textsh.sdi b/sw/sdi/textsh.sdi index b85f0df98a84..a0e0fe6d21b3 100644 --- a/sw/sdi/textsh.sdi +++ b/sw/sdi/textsh.sdi @@ -17,9 +17,6 @@ */ interface Text : BaseText -[ - uuid = "1BD56200-111A-101D-9757-6E74207A7520" -] { FN_INSERT_FRAME_INTERACT // status() [ diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi index 80cafa8af959..ad223f9d2d0c 100644 --- a/sw/sdi/viewsh.sdi +++ b/sw/sdi/viewsh.sdi @@ -17,14 +17,12 @@ */ interface TextInTable -[ uuid = "63C33940-69D8-101D-9757-C667E8298000" ] { import Text; import TextTable; } interface ListInTable -[ uuid="7F1A6E20-69D8-101D-9757-C667E8298000" ] { import Text; import TextList; @@ -32,16 +30,12 @@ interface ListInTable } interface ListInText -[ uuid = "8A4C07E0-69D8-101D-9757-C667E8298000"] { import TextList; import Text; } interface TextEditView : BaseTextEditView -[ - uuid = "09782660-111A-101D-9757-6E74207A7520" -] { // Slots, which are not needed in the WebDocShell FN_INSERT_OBJ_CTRL @@ -211,7 +205,6 @@ shell SwView } interface TextPrintPreview -[ uuid = "1622A480-111A-101D-9757-6E74207A7520" ] { SID_BROWSER_MODE [ diff --git a/sw/sdi/wbeziers.sdi b/sw/sdi/wbeziers.sdi index 613a0243abb8..8a0f5a460942 100644 --- a/sw/sdi/wbeziers.sdi +++ b/sw/sdi/wbeziers.sdi @@ -17,7 +17,6 @@ */ interface Bezier : _Bezier -[ uuid = "68EF7EA0-6876-11D0-A887-008029E86826" ] { } diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi index d76a2ee9b6f9..4c968f138af8 100644 --- a/sw/sdi/wdocsh.sdi +++ b/sw/sdi/wdocsh.sdi @@ -17,9 +17,6 @@ */ interface WebDocument : BaseTextDocument -[ - uuid = "B47F0DE4-1E1F-11d1-89CA-008029E4B0B1" -] { // here only Slots, which the full Writer doesn't need SID_SOURCEVIEW diff --git a/sw/sdi/wformsh.sdi b/sw/sdi/wformsh.sdi index 84584b424da3..238ea6d23518 100644 --- a/sw/sdi/wformsh.sdi +++ b/sw/sdi/wformsh.sdi @@ -16,9 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ interface WebDrawForm: BaseTextDrawForm -[ - uuid = "4bac4490-fede-11d1-abff-006097b418c2" -] { import WebDrawBase; } diff --git a/sw/sdi/wfrmsh.sdi b/sw/sdi/wfrmsh.sdi index 03c51179cbc0..2ca368372e2f 100644 --- a/sw/sdi/wfrmsh.sdi +++ b/sw/sdi/wfrmsh.sdi @@ -17,9 +17,6 @@ */ interface WebFrame : BaseTextFrame -[ - uuid = "B47F0DE6-1E1F-11d1-89CA-008029E4B0B1" -] { import BaseTextSelection; } diff --git a/sw/sdi/wgrfsh.sdi b/sw/sdi/wgrfsh.sdi index 673782cfbcee..09446796e7c8 100644 --- a/sw/sdi/wgrfsh.sdi +++ b/sw/sdi/wgrfsh.sdi @@ -17,9 +17,6 @@ */ interface WebGraphic : BaseTextGraphic -[ - uuid = "B47F0DEB-1E1F-11d1-89CA-008029E4B0B1" -] { } diff --git a/sw/sdi/wlistsh.sdi b/sw/sdi/wlistsh.sdi index 85d66b005099..481f6fc8465b 100644 --- a/sw/sdi/wlistsh.sdi +++ b/sw/sdi/wlistsh.sdi @@ -16,9 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ interface WebList : BaseTextList -[ - uuid = "B47F0DE3-1E1F-11d1-89CA-008029E4B0B1" -] { import TextSelection; } diff --git a/sw/sdi/wolesh.sdi b/sw/sdi/wolesh.sdi index 2955081aa038..33160aded993 100644 --- a/sw/sdi/wolesh.sdi +++ b/sw/sdi/wolesh.sdi @@ -16,9 +16,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ interface WebOLEObject : BaseTextOLEObject -[ - uuid = "B47F0DE2-1E1F-11d1-89CA-008029E4B0B1" -] { import WebFrame; } diff --git a/sw/sdi/wrtapp.sdi b/sw/sdi/wrtapp.sdi index f32a7e27f9c1..57a7e8aec006 100644 --- a/sw/sdi/wrtapp.sdi +++ b/sw/sdi/wrtapp.sdi @@ -17,9 +17,6 @@ */ interface StarWriter -[ - uuid ( "4BF0AA20-E6B9-101C-8A0E-040224007802" ) -] { FN_ENVELOP // status(final|play) [ diff --git a/sw/sdi/wtabsh.sdi b/sw/sdi/wtabsh.sdi index 9d23729e9dad..287b9328189c 100644 --- a/sw/sdi/wtabsh.sdi +++ b/sw/sdi/wtabsh.sdi @@ -17,7 +17,6 @@ */ interface WebTable : BaseTextTable -[ uuid = "B47F0DEC-1E1F-11d1-89CA-008029E4B0B1" ] { import BaseTextSelection; } diff --git a/sw/sdi/wtextsh.sdi b/sw/sdi/wtextsh.sdi index 4a843b0e7615..d196d9fc3072 100644 --- a/sw/sdi/wtextsh.sdi +++ b/sw/sdi/wtextsh.sdi @@ -17,9 +17,6 @@ */ interface WebText : BaseText -[ - uuid = "B47F0DE5-1E1F-11d1-89CA-008029E4B0B1"; -] { FN_INSERT_FRAME_INTERACT_NOCOL [ diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi index 2e634bcf6f75..b8f37e1ad73f 100644 --- a/sw/sdi/wviewsh.sdi +++ b/sw/sdi/wviewsh.sdi @@ -17,14 +17,12 @@ */ interface WebTextInTable -[ uuid = "B47F0DE7-1E1F-11d1-89CA-008029E4B0B1" ] { import WebText; import WebTable; } interface WebListInTable -[ uuid="B47F0DE8-1E1F-11d1-89CA-008029E4B0B1" ] { import WebText; import WebList; @@ -32,16 +30,12 @@ interface WebListInTable } interface WebListInText -[ uuid = "B47F0DE9-1E1F-11d1-89CA-008029E4B0B1"] { import WebList; import WebText; } interface WebEditView : BaseTextEditView -[ - uuid = "B47F0DEA-1E1F-11d1-89CA-008029E4B0B1" -] { SID_DRAW_TEXT_MARQUEE // status() [ @@ -62,7 +56,6 @@ shell SwWebView } interface WebSourceView -[ uuid = "95069CE0-69D8-101D-9757-C667E8298000"] { SID_TABLE_CELL // status() [ |