basctl/sdi/baside.sdi | 6 idl/inc/basobj.hxx | 8 idl/inc/bastype.hxx | 18 -- idl/inc/globals.hxx | 20 -- idl/inc/module.hxx | 4 idl/inc/slot.hxx | 22 +- idl/inc/types.hxx | 19 -- idl/source/objects/basobj.cxx | 19 -- idl/source/objects/bastype.cxx | 81 ---------- idl/source/objects/module.cxx | 17 -- idl/source/objects/slot.cxx | 6 idl/source/objects/types.cxx | 74 --------- idl/source/prj/command.cxx | 3 idl/source/prj/database.cxx | 26 +-- idl/source/prj/globals.cxx | 10 - sc/sdi/app.sdi | 3 sc/sdi/cellsh.sdi | 12 - sc/sdi/docsh.sdi | 16 - sc/sdi/drawsh.sdi | 23 -- sc/sdi/formatsh.sdi | 6 sc/sdi/scalc.sdi | 61 ------- sc/sdi/tabvwsh.sdi | 26 --- sd/sdi/_drvwsh.sdi | 25 --- sd/sdi/app.sdi | 3 sd/sdi/docshell.sdi | 3 sd/sdi/drviewsh.sdi | 3 sd/sdi/grdocsh.sdi | 3 sd/sdi/grviewsh.sdi | 3 sd/sdi/outlnvsh.sdi | 17 -- sd/sdi/sdnew.sdi | 3 sd/sdi/sdraw.sdi | 145 ------------------ sfx2/sdi/docslots.sdi | 3 sfx2/sdi/frmslots.sdi | 101 ------------ sfx2/sdi/sfx.sdi | 95 ----------- starmath/sdi/smath.sdi | 7 starmath/sdi/smslots.sdi | 9 - svx/sdi/fmslots.sdi | 3 svx/sdi/svx.sdi | 329 ----------------------------------------- svx/sdi/svxslots.sdi | 32 --- sw/sdi/_viewsh.sdi | 6 sw/sdi/annotsh.sdi | 3 sw/sdi/basesh.sdi | 3 sw/sdi/beziersh.sdi | 2 sw/sdi/docsh.sdi | 3 sw/sdi/drawsh.sdi | 3 sw/sdi/drwtxtsh.sdi | 4 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/olesh.sdi | 3 sw/sdi/swriter.sdi | 73 --------- sw/sdi/swslots.sdi | 20 -- sw/sdi/tabsh.sdi | 17 -- sw/sdi/textsh.sdi | 11 - sw/sdi/viewsh.sdi | 12 - sw/sdi/wbeziers.sdi | 1 sw/sdi/wdocsh.sdi | 3 sw/sdi/wformsh.sdi | 3 sw/sdi/wfrmsh.sdi | 3 sw/sdi/wgrfsh.sdi | 3 sw/sdi/wlistsh.sdi | 3 sw/sdi/wolesh.sdi | 3 sw/sdi/wrtapp.sdi | 3 sw/sdi/wtabsh.sdi | 1 sw/sdi/wtextsh.sdi | 3 sw/sdi/wviewsh.sdi | 12 - 68 files changed, 33 insertions(+), 1444 deletions(-)
New commits: commit 7f5de2436a5c51ee8dec38a9b04f4a1b3589e361 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 11:34:25 2016 +0200 remove unused Default from .SDI files Change-Id: I253174197e2c10765f9b1e8cff46178854fe3495 diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 6cdbe08..35026a6 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -62,7 +62,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_item; SvStringHashEntryRef MM_PseudoSlots; SvStringHashEntryRef MM_map; - SvStringHashEntryRef MM_Default; SvStringHashEntryRef MM_import; SvStringHashEntryRef MM_SlotIdFile; SvStringHashEntryRef MM_ItemName; @@ -145,7 +144,6 @@ HASH_INLINE(char) HASH_INLINE(BYTE) HASH_INLINE(item) HASH_INLINE(PseudoSlots) -HASH_INLINE(Default) HASH_INLINE(import) HASH_INLINE(SlotIdFile) HASH_INLINE(include) diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 42b90db..7be1205 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -31,7 +31,6 @@ class SvMetaSlot : public SvMetaAttribute SvIdentifier aConfigId; SvIdentifier aExecMethod; SvIdentifier aStateMethod; - SvIdentifier aDefault; SvBOOL aPseudoSlots; SvBOOL aVolatile; @@ -121,18 +120,17 @@ public: SvMetaSlot(); SvMetaSlot( SvMetaType * pType ); - virtual bool IsVariable() const override; - virtual bool IsMethod() const override; - virtual OString GetMangleName( bool bVariable ) const override; + virtual bool IsVariable() const override; + virtual bool IsMethod() const override; + virtual OString GetMangleName( bool bVariable ) const override; SvMetaAttribute * GetMethod() const; SvMetaType * GetSlotType() const; - const OString& GetGroupId() const; - const OString& GetConfigId() const; - const OString& GetExecMethod() const; - const OString& GetStateMethod() const; - const OString& GetDefault() const; - const OString& GetDisableFlags() const; + const OString& GetGroupId() const; + const OString& GetConfigId() const; + const OString& GetExecMethod() const; + const OString& GetStateMethod() const; + const OString& GetDisableFlags() const; bool GetPseudoSlots() const; bool GetVolatile() const; bool GetToggle() const; @@ -145,8 +143,8 @@ public: bool GetNoRecord() const; bool GetRecordAbsolute() const; - const OString& GetPseudoPrefix() const; - const OString& GetUnoName() const; + const OString& GetPseudoPrefix() const; + const OString& GetUnoName() const; bool GetMenuConfig() const; bool GetToolBoxConfig() const; bool GetAccelConfig() const; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 3b8e59c..26ceba0 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -119,11 +119,6 @@ const OString& SvMetaSlot::GetStateMethod() const if( !aStateMethod.getString().isEmpty() || !GetRef() ) return aStateMethod.getString(); return static_cast<SvMetaSlot *>(GetRef())->GetStateMethod(); } -const OString& SvMetaSlot::GetDefault() const -{ - if( !aDefault.getString().isEmpty() || !GetRef() ) return aDefault.getString(); - return static_cast<SvMetaSlot *>(GetRef())->GetDefault(); -} bool SvMetaSlot::GetPseudoSlots() const { if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots; @@ -238,7 +233,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm ); bool bOk = false; - bOk |= aDefault.ReadSvIdl( SvHash_Default(), rInStm ); bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm ); bOk |= aGroupId.ReadSvIdl( SvHash_GroupId(), rInStm ); bOk |= aExecMethod.ReadSvIdl( SvHash_ExecMethod(), rInStm ); diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 8a42ef1..f2181ec 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -77,7 +77,6 @@ char const * SyntaxStrings[] = { "\t\tAccelConfig, MenuConfig, ToolbarConfig", "\t\tAutoUpdate", "\t\tContainer", -"\t\tDefault = Identifier", "\t\tExecMethod = Identifier", "\t\tExport*", "\t\tFastCall", diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 3f20a2c..bcb82b5 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -89,7 +89,6 @@ SvGlobalHashNames::SvGlobalHashNames() A_ENTRY(item) A_ENTRY(PseudoSlots) A_ENTRY(map) - A_ENTRY(Default) A_ENTRY(import) A_ENTRY(SlotIdFile) A_ENTRY(ItemName) commit c8c856bd73c3ce051a2564b30e5d01159d39676c Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 11:31:48 2016 +0200 remove unused HelpFile from .SDI files Change-Id: I881ecb1a0838945dd89aefd99a209ea46b617563 diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 0cd591c..6cdbe08 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -63,7 +63,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_PseudoSlots; SvStringHashEntryRef MM_map; SvStringHashEntryRef MM_Default; - SvStringHashEntryRef MM_HelpFile; SvStringHashEntryRef MM_import; SvStringHashEntryRef MM_SlotIdFile; SvStringHashEntryRef MM_ItemName; @@ -147,7 +146,6 @@ HASH_INLINE(BYTE) HASH_INLINE(item) HASH_INLINE(PseudoSlots) HASH_INLINE(Default) -HASH_INLINE(HelpFile) HASH_INLINE(import) HASH_INLINE(SlotIdFile) HASH_INLINE(include) diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 63142cd..d5f9356 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -29,7 +29,6 @@ class SvMetaModule : public SvMetaExtern SvMetaTypeMemberList aTypeList; SvMetaAttributeMemberList aAttrList; // browser - SvString aHelpFileName; SvString aSlotIdFile; SvString aModulePrefix; diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 32fe1f8..132a5f2 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -48,7 +48,6 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, { SvMetaExtern::ReadAttributesSvIdl( rBase, rInStm ); - aHelpFileName.ReadSvIdl( SvHash_HelpFile(), rInStm ); if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) ) { sal_uInt32 nTokPos = rInStm.Tell(); diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 4c95cc0..3f20a2c 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -90,7 +90,6 @@ SvGlobalHashNames::SvGlobalHashNames() A_ENTRY(PseudoSlots) A_ENTRY(map) A_ENTRY(Default) - A_ENTRY(HelpFile) A_ENTRY(import) A_ENTRY(SlotIdFile) A_ENTRY(ItemName) commit e02d63406ac3d1c99661d1e706d8c367c30b3a9e Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 11:28:55 2016 +0200 remove unused SvName from .SDI files Change-Id: I5aa9d2e3798ebb9da5bb1283000d744e9a68de25 diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index c9c4769..0cd591c 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -66,7 +66,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_HelpFile; SvStringHashEntryRef MM_import; SvStringHashEntryRef MM_SlotIdFile; - SvStringHashEntryRef MM_SvName; SvStringHashEntryRef MM_ItemName; SvStringHashEntryRef MM_include; SvStringHashEntryRef MM_ExecMethod; @@ -151,7 +150,6 @@ HASH_INLINE(Default) HASH_INLINE(HelpFile) HASH_INLINE(import) HASH_INLINE(SlotIdFile) -HASH_INLINE(SvName) HASH_INLINE(include) HASH_INLINE(ExecMethod) HASH_INLINE(StateMethod) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 7d99cf9..9de51df 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -82,7 +82,6 @@ class SvMetaType : public SvMetaExtern SvBOOL aIn; // input parameter SvBOOL aOut; // return parameter Svint aCall0, aCall1; - SvIdentifier aSvName; SvIdentifier aCName; SvIdentifier aBasicPostfix; SvIdentifier aBasicName; @@ -97,7 +96,6 @@ class SvMetaType : public SvMetaExtern protected: bool ReadNamesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ); - virtual void ReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override; bool ReadHeaderSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); @@ -141,7 +139,6 @@ public: { aBasicName.setString(rName); } const OString& GetBasicName() const; - const OString& GetSvName() const; const OString& GetCName() const; char GetParserChar() const { return cParserChar; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 797bd13..61f83ca 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -332,14 +332,6 @@ int SvMetaType::GetCall1() const return static_cast<SvMetaType *>(GetRef())->GetCall1(); } -const OString& SvMetaType::GetSvName() const -{ - if( aSvName.IsSet() || !GetRef() ) - return aSvName.getString(); - else - return static_cast<SvMetaType *>(GetRef())->GetSvName(); -} - const OString& SvMetaType::GetCName() const { if( aCName.IsSet() || !GetRef() ) @@ -350,7 +342,6 @@ const OString& SvMetaType::GetCName() const bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase ) { - aSvName.setString(rName); aCName.setString(rName); return SvMetaReference::SetName( rName, pBase ); } @@ -447,13 +438,6 @@ bool SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase, return bOk; } -void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) -{ - SvMetaExtern::ReadAttributesSvIdl( rBase, rInStm ); - aSvName.ReadSvIdl( SvHash_SvName(), rInStm ); -} - void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 1770eec..4c95cc0 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -93,7 +93,6 @@ SvGlobalHashNames::SvGlobalHashNames() A_ENTRY(HelpFile) A_ENTRY(import) A_ENTRY(SlotIdFile) - A_ENTRY(SvName) A_ENTRY(ItemName) A_ENTRY(include) A_ENTRY(ExecMethod) commit 8763140b566e672d0c2afa563a465bac91c1d983 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 11:21:39 2016 +0200 remove unused SbxName from .SDI files Change-Id: I1d0bd2477d22c5f71fd61882756e05e2e30dfa6f diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 7da64bb..c9c4769 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -67,7 +67,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_import; SvStringHashEntryRef MM_SlotIdFile; SvStringHashEntryRef MM_SvName; - SvStringHashEntryRef MM_SbxName; SvStringHashEntryRef MM_ItemName; SvStringHashEntryRef MM_include; SvStringHashEntryRef MM_ExecMethod; @@ -153,7 +152,6 @@ HASH_INLINE(HelpFile) HASH_INLINE(import) HASH_INLINE(SlotIdFile) HASH_INLINE(SvName) -HASH_INLINE(SbxName) HASH_INLINE(include) HASH_INLINE(ExecMethod) HASH_INLINE(StateMethod) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index ff36584..7d99cf9 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -83,7 +83,6 @@ class SvMetaType : public SvMetaExtern SvBOOL aOut; // return parameter Svint aCall0, aCall1; SvIdentifier aSvName; - SvIdentifier aSbxName; SvIdentifier aCName; SvIdentifier aBasicPostfix; SvIdentifier aBasicName; @@ -106,7 +105,7 @@ public: SvMetaType(); SvMetaType( const OString& rTypeName, char cParserChar, const OString& rCName ); - SvMetaType( const OString& rTypeName, const OString& rSbxName, + SvMetaType( const OString& rTypeName, char cParserChar, const OString& rCName, const OString& rBasicName, const OString& rBasicPostfix ); @@ -143,7 +142,6 @@ public: const OString& GetBasicName() const; const OString& GetSvName() const; - const OString& GetSbxName() const; const OString& GetCName() const; char GetParserChar() const { return cParserChar; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index ed5275e..797bd13 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -208,7 +208,6 @@ SvMetaType::SvMetaType( const OString& rName, char cPC, } SvMetaType::SvMetaType( const OString& rName, - const OString& rSbxName, char cPc, const OString& rCName, const OString& rBasicName, @@ -216,7 +215,6 @@ SvMetaType::SvMetaType( const OString& rName, CTOR { SetName( rName ); - aSbxName.setString(rSbxName); cParserChar = cPc; aCName.setString(rCName); aBasicName.setString(rBasicName); @@ -342,14 +340,6 @@ const OString& SvMetaType::GetSvName() const return static_cast<SvMetaType *>(GetRef())->GetSvName(); } -const OString& SvMetaType::GetSbxName() const -{ - if( aSbxName.IsSet() || !GetRef() ) - return aSbxName.getString(); - else - return static_cast<SvMetaType *>(GetRef())->GetSbxName(); -} - const OString& SvMetaType::GetCName() const { if( aCName.IsSet() || !GetRef() ) @@ -361,7 +351,6 @@ const OString& SvMetaType::GetCName() const bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase ) { aSvName.setString(rName); - aSbxName.setString(rName); aCName.setString(rName); return SvMetaReference::SetName( rName, pBase ); } @@ -463,7 +452,6 @@ void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase, { SvMetaExtern::ReadAttributesSvIdl( rBase, rInStm ); aSvName.ReadSvIdl( SvHash_SvName(), rInStm ); - aSbxName.ReadSvIdl( SvHash_SbxName(), rInStm ); } void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase, @@ -609,7 +597,7 @@ OString SvMetaType::GetParserString() const } SvMetaTypeString::SvMetaTypeString() - : SvMetaType( "String", "SbxSTRING", 's', "char *", "String", "$" ) + : SvMetaType( "String", 's', "char *", "String", "$" ) { } @@ -685,7 +673,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, } SvMetaTypevoid::SvMetaTypevoid() - : SvMetaType( "void", "SbxVOID", 'v', "void", "", "" ) + : SvMetaType( "void", 'v', "void", "", "" ) { } diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 10682cf..cfe2b5b 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -47,7 +47,7 @@ SvIdlDataBase::~SvIdlDataBase() #define ADD_TYPE( Name, ParserChar, CName, BasName, BasPost ) \ aTypeList.push_back( new SvMetaType( SvHash_##Name()->GetName(), \ - BasName, ParserChar, CName, BasName, BasPost ) ); + ParserChar, CName, BasName, BasPost ) ); SvMetaTypeMemberList & SvIdlDataBase::GetTypeList() { diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 2925435..1770eec 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -94,7 +94,6 @@ SvGlobalHashNames::SvGlobalHashNames() A_ENTRY(import) A_ENTRY(SlotIdFile) A_ENTRY(SvName) - A_ENTRY(SbxName) A_ENTRY(ItemName) A_ENTRY(include) A_ENTRY(ExecMethod) commit 1c3649c2be470d4ac324727a56594c1f6a2b5bf2 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 11:18:08 2016 +0200 remove unused OdlName from .SDI files Change-Id: I1ce7de74b9cb9a2cebbacf8d81c0ca9164a1596a diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index dcb32ac..7da64bb 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -69,7 +69,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_SvName; SvStringHashEntryRef MM_SbxName; SvStringHashEntryRef MM_ItemName; - SvStringHashEntryRef MM_OdlName; SvStringHashEntryRef MM_include; SvStringHashEntryRef MM_ExecMethod; SvStringHashEntryRef MM_StateMethod; @@ -155,7 +154,6 @@ HASH_INLINE(import) HASH_INLINE(SlotIdFile) HASH_INLINE(SvName) HASH_INLINE(SbxName) -HASH_INLINE(OdlName) HASH_INLINE(include) HASH_INLINE(ExecMethod) HASH_INLINE(StateMethod) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 69e3928..ff36584 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -84,7 +84,6 @@ class SvMetaType : public SvMetaExtern Svint aCall0, aCall1; SvIdentifier aSvName; SvIdentifier aSbxName; - SvIdentifier aOdlName; SvIdentifier aCName; SvIdentifier aBasicPostfix; SvIdentifier aBasicName; @@ -108,7 +107,7 @@ public: SvMetaType( const OString& rTypeName, char cParserChar, const OString& rCName ); SvMetaType( const OString& rTypeName, const OString& rSbxName, - const OString& rOdlName, char cParserChar, + char cParserChar, const OString& rCName, const OString& rBasicName, const OString& rBasicPostfix ); @@ -142,11 +141,10 @@ public: void SetBasicName(const OString& rName) { aBasicName.setString(rName); } - const OString& GetBasicName() const; - const OString& GetSvName() const; - const OString& GetSbxName() const; - const OString& GetOdlName() const; - const OString& GetCName() const; + const OString& GetBasicName() const; + const OString& GetSvName() const; + const OString& GetSbxName() const; + const OString& GetCName() const; char GetParserChar() const { return cParserChar; } virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr ) override; diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 8249cf1..ed5275e 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -209,7 +209,6 @@ SvMetaType::SvMetaType( const OString& rName, char cPC, SvMetaType::SvMetaType( const OString& rName, const OString& rSbxName, - const OString& rOdlName, char cPc, const OString& rCName, const OString& rBasicName, @@ -218,7 +217,6 @@ SvMetaType::SvMetaType( const OString& rName, { SetName( rName ); aSbxName.setString(rSbxName); - aOdlName.setString(rOdlName); cParserChar = cPc; aCName.setString(rCName); aBasicName.setString(rBasicName); @@ -241,7 +239,6 @@ void SvMetaType::SetType( int nT ) nType = nT; if( nType == TYPE_ENUM ) { - aOdlName.setString("short"); } else if( nType == TYPE_CLASS ) { @@ -353,14 +350,6 @@ const OString& SvMetaType::GetSbxName() const return static_cast<SvMetaType *>(GetRef())->GetSbxName(); } -const OString& SvMetaType::GetOdlName() const -{ - if( aOdlName.IsSet() || !GetRef() ) - return aOdlName.getString(); - else - return static_cast<SvMetaType *>(GetRef())->GetOdlName(); -} - const OString& SvMetaType::GetCName() const { if( aCName.IsSet() || !GetRef() ) @@ -374,8 +363,6 @@ bool SvMetaType::SetName( const OString& rName, SvIdlDataBase * pBase ) aSvName.setString(rName); aSbxName.setString(rName); aCName.setString(rName); - if( GetType() != TYPE_ENUM ) - aOdlName.setString(rName); return SvMetaReference::SetName( rName, pBase ); } @@ -477,7 +464,6 @@ void SvMetaType::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvMetaExtern::ReadAttributesSvIdl( rBase, rInStm ); aSvName.ReadSvIdl( SvHash_SvName(), rInStm ); aSbxName.ReadSvIdl( SvHash_SbxName(), rInStm ); - aOdlName.ReadSvIdl( SvHash_OdlName(), rInStm ); } void SvMetaType::ReadContextSvIdl( SvIdlDataBase & rBase, @@ -623,7 +609,7 @@ OString SvMetaType::GetParserString() const } SvMetaTypeString::SvMetaTypeString() - : SvMetaType( "String", "SbxSTRING", "BSTR", 's', "char *", "String", "$" ) + : SvMetaType( "String", "SbxSTRING", 's', "char *", "String", "$" ) { } @@ -699,7 +685,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, } SvMetaTypevoid::SvMetaTypevoid() - : SvMetaType( "void", "SbxVOID", "void", 'v', "void", "", "" ) + : SvMetaType( "void", "SbxVOID", 'v', "void", "", "" ) { } diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index 33c2a4d..10682cf 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -45,9 +45,9 @@ SvIdlDataBase::~SvIdlDataBase() delete pIdTable; } -#define ADD_TYPE( Name, OdlName, ParserChar, CName, BasName, BasPost ) \ +#define ADD_TYPE( Name, ParserChar, CName, BasName, BasPost ) \ aTypeList.push_back( new SvMetaType( SvHash_##Name()->GetName(), \ - BasName, OdlName, ParserChar, CName, BasName, BasPost ) ); + BasName, ParserChar, CName, BasName, BasPost ) ); SvMetaTypeMemberList & SvIdlDataBase::GetTypeList() { @@ -57,17 +57,17 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList() aTypeList.push_back( new SvMetaTypevoid() ); // MI: IDispatch::Invoke can not unsigned - ADD_TYPE( UINT16, "long", 'h', "unsigned short", "Long", "&" ); - ADD_TYPE( INT16, "short", 'h', "short", "Integer", "%" ); - ADD_TYPE( UINT32, "long", 'l', "unsigned long", "Long", "&" ); - ADD_TYPE( INT32, "long", 'l', "long", "Long", "&" ); - ADD_TYPE( int, "int", 'i', "int", "Integer", "%" ); - ADD_TYPE( BOOL, "boolean", 'b', "unsigned char", "Boolean", "" ); - ADD_TYPE( char, "char", 'c', "char", "Integer", "%" ); - ADD_TYPE( BYTE, "char", 'c', "unsigned char", "Integer", "%" ); - ADD_TYPE( float, "float", 'f', "float", "Single", "!" ); - ADD_TYPE( double, "double", 'F', "double", "Double", "#" ); - ADD_TYPE( SbxObject, "VARIANT", 'o', "C_Object", "Object", "" ); + ADD_TYPE( UINT16, 'h', "unsigned short", "Long", "&" ); + ADD_TYPE( INT16, 'h', "short", "Integer", "%" ); + ADD_TYPE( UINT32, 'l', "unsigned long", "Long", "&" ); + ADD_TYPE( INT32, 'l', "long", "Long", "&" ); + ADD_TYPE( int, 'i', "int", "Integer", "%" ); + ADD_TYPE( BOOL, 'b', "unsigned char", "Boolean", "" ); + ADD_TYPE( char, 'c', "char", "Integer", "%" ); + ADD_TYPE( BYTE, 'c', "unsigned char", "Integer", "%" ); + ADD_TYPE( float, 'f', "float", "Single", "!" ); + ADD_TYPE( double, 'F', "double", "Double", "#" ); + ADD_TYPE( SbxObject, 'o', "C_Object", "Object", "" ); // Attention! When adding types all binary data bases get incompatible diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index f30bf10..2925435 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -96,7 +96,6 @@ SvGlobalHashNames::SvGlobalHashNames() A_ENTRY(SvName) A_ENTRY(SbxName) A_ENTRY(ItemName) - A_ENTRY(OdlName) A_ENTRY(include) A_ENTRY(ExecMethod) A_ENTRY(StateMethod) commit 90942b2f89d1566d1c6742ccb51bf896f10352f5 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 11:06:07 2016 +0200 remove unused TypeLib from .SDI files Change-Id: Ibbef34aee530bf65c3b3d35348e33f210a4c2a67 diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 64a8da7..dcb32ac 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -74,7 +74,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_ExecMethod; SvStringHashEntryRef MM_StateMethod; SvStringHashEntryRef MM_GroupId; - SvStringHashEntryRef MM_TypeLibFile; SvStringHashEntryRef MM_Export; SvStringHashEntryRef MM_PseudoPrefix; SvStringHashEntryRef MM_define; @@ -163,7 +162,6 @@ HASH_INLINE(StateMethod) HASH_INLINE(GroupId) HASH_INLINE(float) HASH_INLINE(double) -HASH_INLINE(TypeLibFile) HASH_INLINE(Export) HASH_INLINE(PseudoPrefix) HASH_INLINE(define) diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 67df871..63142cd 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -31,7 +31,6 @@ class SvMetaModule : public SvMetaExtern // browser SvString aHelpFileName; SvString aSlotIdFile; - SvString aTypeLibFile; SvString aModulePrefix; bool bImported : 1, diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 21c4e76..32fe1f8 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -62,7 +62,6 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, rInStm.Seek( nTokPos ); } } - aTypeLibFile.ReadSvIdl( SvHash_TypeLibFile(), rInStm ); aModulePrefix.ReadSvIdl( SvHash_ModulePrefix(), rInStm ); } diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index b46035d..f30bf10 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -101,7 +101,6 @@ SvGlobalHashNames::SvGlobalHashNames() A_ENTRY(ExecMethod) A_ENTRY(StateMethod) A_ENTRY(GroupId) - A_ENTRY(TypeLibFile) A_ENTRY(Export) A_ENTRY(PseudoPrefix) A_ENTRY(define) commit ce97f3a37bf01a53d68eb8cd50ca72694ec2a922 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 11:04:54 2016 +0200 remove commented out stuff from .SDI files Change-Id: I1e893afcd33bf9a5cf934a021fe40548ddc33699 diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index 2e22ad6..0aa9964 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -36,8 +36,6 @@ interface TableDraw SID_OPENDLG_EDIT_PRINTAREA [ StateMethod = StateDisableItems; Export = FALSE; ] // andere: SID_DRAW_CHART [ StateMethod = StateDisableItems; Export = FALSE; ] - //! SID_STYLE_DESIGNER [ StateMethod = StateDisableItems; Export = FALSE; ] - //! SID_OPENDLG_FUNCTION[ StateMethod = StateDisableItems; Export = FALSE; ] SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; Export = FALSE; ] SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; Export = FALSE; ] SID_STYLE_APPLY [ StateMethod = StateDisableItems; Export = FALSE; ] @@ -120,10 +118,8 @@ interface TableDraw //! PseudoSlots gibt Aerger mit Referenz-Dialogen ??? SID_OBJECT_ALIGN [ - // PseudoSlots = TRUE; PseudoSlots = FALSE ; Export = FALSE ; - // PseudoPrefix = SID_OBJECT_ALIGN; ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; GroupId = GID_FORMAT ; @@ -158,16 +154,6 @@ interface TableDraw // !!! special SID_DELETE [ExecMethod = ExecDrawFunc ;StateMethod = GetDrawFuncState; Export = FALSE ;] - /* - SfxVoidItem Delete SID_DELETE ( ) - [ - ExecMethod = ExecDrawFunc ; - StateMethod = GetDrawFuncState ; - Export = FALSE ; - GroupId = GID_EDIT ; - ToolBoxConfig , MenuConfig , AccelConfig ; - ] - */ SID_DELETE_CONTENTS [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_CUT [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_COPY [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] @@ -177,15 +163,6 @@ interface TableDraw SID_OBJECT_MIRROR [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] SID_BEZIER_EDIT [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] SID_MIRROR_HORIZONTAL[ ExecMethod = ExecDrawFunc;StateMethod = GetDrawFuncState; Export = FALSE; ] - /* - SfxVoidItem ObjectMirrorHorizontal SID_MIRROR_HORIZONTAL ( ) - [ - StateMethod = GetDrawFuncState ; - Export = FALSE ; - GroupId = GID_FORMAT ; - MenuConfig ; //FS - ] - */ SID_MIRROR_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_FLIP_HORIZONTAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_FLIP_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index 7a08418..4597f16 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -86,7 +86,6 @@ interface BaseSelection SID_DRAW_NOTEEDIT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_OBJECTRESIZE [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - //SID_CHOOSE_CONTROLS [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_OBJECT_SELECT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_DRAW_LINE [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] SID_DRAW_RECT [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ] diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index c303e6f..dee3df2 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -284,13 +284,6 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] - /* -> SVX - SID_PARA_DLG // ole : no, status : ? - [ - ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; - ] -*/ SID_PARA_DLG // ole : no, status : ? [ @@ -781,13 +774,6 @@ interface DrawView StateMethod = GetMenuState ; ] - /* -> SVX - SID_OBJECT_ROTATE // ole : no, status : ? - [ - ExecMethod = FuPermanent ; - StateMethod = GetMenuState ; - ] -*/ SID_OBJECT_ROTATE // ole : no, status : ? [ @@ -802,13 +788,6 @@ interface DrawView ExecMethod = FuPermanent ; StateMethod = GetMenuState ; ] - /* -> DB - SID_OBJECT_MIRROR // ole : no, status : play rec - [ - ExecMethod = FuPermanent ; - StateMethod = GetMenuState ; - ] -*/ SID_OBJECT_MIRROR // ole : no, status : play rec [ @@ -2127,15 +2106,11 @@ interface DrawView [ ExecMethod = ExecOptionsBar ; StateMethod = GetOptionsBarState ; - //ExecMethod = FuTemporary ; - //StateMethod = GetMenuState ; ] SID_HELPLINES_VISIBLE // ole : no, status : ? [ ExecMethod = ExecOptionsBar ; StateMethod = GetOptionsBarState ; - //ExecMethod = FuTemporary ; - //StateMethod = GetMenuState ; ] SID_SOLID_CREATE // ole : ?, status : ? [ diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index 535f196d..fdbbfd7 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -427,20 +427,6 @@ interface OutlineView ExecMethod = FuTemporaryModify ; StateMethod = GetMenuState ; ] - /* - SID_PRINTDOC // ole : no, status : ? - [ - StateMethod = GetMenuState ; - ] - SID_PRINTDOCDIRECT // ole : no, status : ? - [ - StateMethod = GetMenuState ; - ] - SID_SETUPPRINTER // ole : no, status : ? - [ - StateMethod = GetMenuState ; - ] -*/ SID_MAIL_SCROLLBODY_PAGEDOWN // ole : no, status : ? [ diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi index d187e12..3d41c1c 100644 --- a/sfx2/sdi/frmslots.sdi +++ b/sfx2/sdi/frmslots.sdi @@ -155,107 +155,6 @@ interface Window - sfx2/source/dialog/dockwin.cxx - sfx2/sdi/frmslots.sdi - sfx2/inc/sfx2/sfxsids.hrc - - SID_DOCKWIN_10 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_11 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_12 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_13 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_14 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_15 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_16 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_17 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_18 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_19 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_20 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_21 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_22 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_23 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_24 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_25 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_26 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_27 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_28 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] - SID_DOCKWIN_29 - [ - ExecMethod = ChildWindowExecute ; - StateMethod = ChildWindowState ; - ] */ // Window.GetFrameWindow( "Name" ) SID_FILLFRAME diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi index d29b2a3..4e501cb 100644 --- a/svx/sdi/svxslots.sdi +++ b/svx/sdi/svxslots.sdi @@ -25,7 +25,6 @@ SlotIdFile( "svxslots.hrc" ) ] { - include "sfxitems.sdi" include "sfx.sdi" include "svxitems.sdi" @@ -33,27 +32,5 @@ SlotIdFile( "svxslots.hrc" ) include "svx.sdi" include "fmslots.sdi" -/* interface SearchSettings: Object - { - SID_SEARCH_ITEM - [ - ExecMethod = _ExecSearch; - StateMethod = _StateSearch; - ] - } - - interface Interior : Object - { - SID_ATTR_BRUSH // status(final|play) - [ - ExecMethod = ExecBckCol ; - StateMethod = GetBckColState ; - ] - } - - interface OLEObjects : Collection - { - } -*/ } diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index ab835f5..7aed0a1 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -472,9 +472,8 @@ interface BaseTextEditView StateMethod = GetState ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - /* - search and replace -*/ + + /* search and replace */ SID_SEARCH_ITEM // status() [ diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi index 389e883..380ab72 100644 --- a/sw/sdi/swslots.sdi +++ b/sw/sdi/swslots.sdi @@ -33,25 +33,7 @@ ModulePrefix( "Sw" ) include "svx.sdi" item String TbxDummyItem; -/* - item String XFillAttrSetItem; - item String XFillBitmapItem; - item String XFillColorItem; - item String XFillGradientItem; - item String XFillHatchItem; - item String XFillStyleItem; - item String XLineAttrSetItem; - item String XLineColorItem; - item String XLineDashItem; - item String XLineEndItem; - item String XLineEndWidthItem; - item String XLineEndCenterItem; - item String XLineStartItem; - item String XLineStartWidthItem; - item String XLineStartCenterItem; - item String XLineStyleItem; - item String XLineWidthItem; -*/ + include "switems.sdi" include "swriter.sdi" diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi index c229880..1e362ef 100644 --- a/sw/sdi/tabsh.sdi +++ b/sw/sdi/tabsh.sdi @@ -29,20 +29,6 @@ interface TextTable : BaseTextTable StateMethod = NoState; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] -/* - SvxFormatSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play) - [ - ExecMethod = Execute; - StateMethod = GetState; - GroupId = GID_TABLE ; - ] - SvxFormatKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play) - [ - ExecMethod = Execute; - StateMethod = GetState; - GroupId = GID_TABLE ; - ] -*/ } shell SwTableShell : SwBaseShell diff --git a/sw/sdi/textsh.sdi b/sw/sdi/textsh.sdi index a0e0fe6..2b8f194 100644 --- a/sw/sdi/textsh.sdi +++ b/sw/sdi/textsh.sdi @@ -37,14 +37,6 @@ interface Text : BaseText ReadOnlyDoc = FALSE ; ] -/* -enum TOXTypes -{ - TOX_INDEX, - TOX_USER, - TOX_CONTENT -}; -*/ FN_INSERT_IDX_ENTRY_DLG // status(final|play) [ diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi index ad223f9..30dd84d 100644 --- a/sw/sdi/viewsh.sdi +++ b/sw/sdi/viewsh.sdi @@ -195,13 +195,8 @@ interface TextEditView : BaseTextEditView } shell SwView - { import TextEditView; -// import TextPage "Page"; -// import SearchSettings; -// import SearchAttributes; -// import ReplaceAttributes; } interface TextPrintPreview diff --git a/sw/sdi/wviewsh.sdi b/sw/sdi/wviewsh.sdi index b8f37e1..0e2a0ac 100644 --- a/sw/sdi/wviewsh.sdi +++ b/sw/sdi/wviewsh.sdi @@ -48,11 +48,6 @@ interface WebEditView : BaseTextEditView shell SwWebView { import WebEditView; -// import SearchSettings; -// import TextPage "Page"; -// import SearchAttributes; -// import ReplaceAttributes; - } interface WebSourceView commit 114904097baa0a456b59d168742c04a1c73432a8 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 10:36:32 2016 +0200 remove unused UUID and VERSION from .SDI files Change-Id: Ieb3e47c10c497a6f642f28a6741ac0fd2ecfd419 diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi index 40472c0..e61f737 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 2f39313..a0b3a09 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 3fd6069..6448e71 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 b6165ab..64a8da7 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 b6e67e7..67df871 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 6b8a0ae..69e3928 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 0a4fb4e..397ed7a 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 40b317e..becefb8 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 0109211..21c4e76 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 71312b1..8249cf1 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 30da370..8a42ef1 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 89d4b16..b46035d 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 a61c684..d8f2dce 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 1f1058a..126c6f7 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 ab22bbf..d103ee7 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 8846b50..782f99b 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 b73886b..7a08418 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 e4e10d6..b2f6e16 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 89a2766..d2a0011 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 3ec71655..0ae6eea 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 892edfa..961a4c6 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 3938b70..df765f3 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 d94914c..535f196d 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 4eb54f9..73e1e4d 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 e51e212..f32d26f 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 e7b6ad9..beb700e 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 35d117c..d29b2a3 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 ceb47a6..ab835f5 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 5617a5a..fbefb5e 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 4767071..df3ff96 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 88d5071..f9549fb 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 64c3cb9..1713221 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 5b9c668..81fdbf8 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 b6f13fc..bc05667 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 92eb2b7..348fc59 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 4e7b06b..73f8af1 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 f289b97..956a0c8 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 9148277..fb53d29 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 0409dc2..5944c45 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 744e631..19c826c 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 120c219..c229880 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 b85f0df..a0e0fe6 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 80cafa8..ad223f9 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 613a0243..8a0f5a4 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 d76a2ee..4c968f1 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 84584b4..238ea6d 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 03c5117..2ca3683 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 673782c..0944679 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 85d66b0..481f6fc 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 2955081..33160ad 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 f32a7e2..57a7e8a 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 9d23729..287b932 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 4a843b0..d196d9f 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 2e634bc..b8f37e1 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() [ commit f811edfa9a0faaee2551be1fd9e401dfb4168a10 Author: Noel Grandin <n...@peralex.com> Date: Thu Feb 4 09:41:04 2016 +0200 remove unused Readonly from .SDI files Change-Id: I179200ad65492c517ef5e986fd05758896d38813 diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 50286b7..b6165ab 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -94,7 +94,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_union; SvStringHashEntryRef MM_struct; SvStringHashEntryRef MM_typedef; - SvStringHashEntryRef MM_Readonly; SvStringHashEntryRef MM_SlotType; SvStringHashEntryRef MM_ModulePrefix; SvStringHashEntryRef MM_DisableFlags; @@ -187,7 +186,6 @@ HASH_INLINE(ReadOnlyDoc) HASH_INLINE(union) HASH_INLINE(struct) HASH_INLINE(typedef) -HASH_INLINE(Readonly) HASH_INLINE(SlotType) HASH_INLINE(ModulePrefix) HASH_INLINE(DisableFlags) diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 1788775..6b8a0ae 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 aReadonly; SvBOOL aIsCollection; SvBOOL aReadOnlyDoc; SvBOOL aHidden; @@ -52,7 +51,6 @@ public: void SetNewAttribute( bool bNew ) { bNewAttr = bNew; } - bool GetReadonly() const; void SetSlotId( const SvIdentifier & rId ) { aSlotId = rId; } const SvIdentifier & GetSlotId() const; diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 10d8e7c..71312b1 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -60,12 +60,6 @@ const SvIdentifier & SvMetaAttribute::GetSlotId() const return static_cast<SvMetaAttribute *>(GetRef())->GetSlotId(); } -bool SvMetaAttribute::GetReadonly() const -{ - if( aReadonly.IsSet() || !GetRef() ) return aReadonly; - return static_cast<SvMetaAttribute *>(GetRef())->GetReadonly(); -} - bool SvMetaAttribute::GetExport() const { if( aExport.IsSet() || !GetRef() ) return aExport; @@ -178,15 +172,6 @@ void SvMetaAttribute::ReadAttributesSvIdl( SvIdlDataBase & rBase, aHidden.ReadSvIdl( SvHash_Hidden(), rInStm ); aIsCollection.ReadSvIdl( SvHash_IsCollection(), rInStm ); aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm ); - if( aReadonly.ReadSvIdl( SvHash_Readonly(), rInStm ) ) - { - if( GetType()->GetType() == TYPE_METHOD ) - { - // set error - rBase.SetError( "Readonly in function attribute", rInStm.GetToken() ); - rBase.WriteError( rInStm ); - } - } } sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray ) diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 1fdbef4..30da370 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -88,7 +88,6 @@ char const * SyntaxStrings[] = { "\t\tImageReflection", "\t\tPseudoPrefix = Identifier", "\t\tPseudoSlots", -"\t\tReadOnly", "\t\tReadOnlyDoc*", "\t\tRecordPerSet*, RecordPerItem, NoRecord", "\t\tRecordAbsolute", diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 4106eda..89d4b16 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -121,7 +121,6 @@ SvGlobalHashNames::SvGlobalHashNames() A_ENTRY(union) A_ENTRY(struct) A_ENTRY(typedef) - A_ENTRY(Readonly) A_ENTRY(SlotType) A_ENTRY(ModulePrefix) A_ENTRY(DisableFlags) diff --git a/sc/sdi/docsh.sdi b/sc/sdi/docsh.sdi index 4a9587e..ab22bbf 100644 --- a/sc/sdi/docsh.sdi +++ b/sc/sdi/docsh.sdi @@ -36,7 +36,6 @@ interface TableSelection ] UINT16 Index FID_TAB_INDEX [ - Readonly ; ] FID_PROTECT_TABLE [ ExecMethod = Execute; StateMethod = GetState; ] FID_PROTECT_DOC [ ExecMethod = Execute; StateMethod = GetState; ] @@ -80,7 +79,6 @@ interface TableDocument SID_ATTR_YEAR2000 [ StateMethod = GetState; ExecMethod = Execute; ] SbxObject OLEObjects [ - Readonly ; IsCollection ; ] SID_CHART_SOURCE [ ExecMethod = Execute; ] diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index 093c6ef..d578845 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -88,7 +88,6 @@ SfxObjectItem ActiveCell SID_SC_ACTIVECELL RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -110,7 +109,6 @@ SfxObjectItem ActiveTable SID_SC_ACTIVETAB RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -212,7 +210,6 @@ SfxStringItem Address SID_RANGE_ADDRESS RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -437,7 +434,6 @@ SfxBoolItem AutoComplete FID_AUTOCOMPLETE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -479,7 +475,6 @@ SfxBoolItem AutomaticCalculation FID_AUTO_CALC RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -521,7 +516,6 @@ SfxBoolItem AutoRefreshArrows SID_DETECTIVE_AUTO RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -805,7 +799,6 @@ SfxInt16Item Column SID_RANGE_COL RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -827,7 +820,6 @@ SfxUInt16Item ColumnWidth FID_COL_WIDTH RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1108,7 +1100,6 @@ SfxObjectItem CurrentRegion SID_RANGE_REGION RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -1350,7 +1341,6 @@ SfxObjectItem DataPilotTables SID_PIVOT_GET RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -2300,7 +2290,6 @@ SfxStringItem Formula SID_RANGE_FORMULA RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -2342,7 +2331,6 @@ SfxVoidItem FunctionBox FID_FUNCTION_BOX RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -3088,7 +3076,6 @@ SvxHorJustifyItem HorizontalAlignment SID_H_ALIGNCELL RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -3213,7 +3200,6 @@ SfxVoidItem InsCellsCtrl SID_TBXCTL_INSCELLS RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -3436,7 +3422,6 @@ SfxVoidItem InsertCtrl SID_TBXCTL_INSERT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -4021,7 +4006,6 @@ SfxStringItem NoteText SID_RANGE_NOTETEXT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -4043,7 +4027,6 @@ SfxBoolItem NoteVisible FID_NOTE_VISIBLE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -4065,7 +4048,6 @@ SfxBoolItem ShowNote FID_SHOW_NOTE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -4087,7 +4069,6 @@ SfxBoolItem HideNote FID_HIDE_NOTE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -4129,7 +4110,6 @@ SfxStringItem NumberFormat SID_NUMBER_FORMAT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -4331,7 +4311,6 @@ SfxInt32Item ObjectHeight SID_OBJECT_HEIGHT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -4353,7 +4332,6 @@ SfxInt32Item ObjectLeft SID_OBJECT_LEFT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -4415,7 +4393,6 @@ SfxInt32Item ObjectTop SID_OBJECT_TOP RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -4437,7 +4414,6 @@ SfxInt32Item ObjectWidth SID_OBJECT_WIDTH RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -4479,7 +4455,6 @@ SfxObjectItem OleObject SID_OLE_OBJECT RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -4521,7 +4496,6 @@ SfxBoolItem NormalViewMode FID_NORMALVIEWMODE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -4543,7 +4517,6 @@ SfxBoolItem PagebreakMode FID_PAGEBREAKMODE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -4909,7 +4882,6 @@ SfxInt32Item Row SID_RANGE_ROW RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -4931,7 +4903,6 @@ SfxUInt16Item RowHeight FID_ROW_HEIGHT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -5228,7 +5199,6 @@ SfxObjectItem SelectedObject SID_SC_ACTIVEOBJECT RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -5250,7 +5220,6 @@ SfxStringItem SelectedObjectName SID_ACTIVE_OBJ_NAME RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -5272,7 +5241,6 @@ SfxObjectItem Selection SID_SC_SELECTION RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -5796,7 +5764,6 @@ SfxUInt16Item StatusBarFunc SID_PSZ_FUNCTION RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -5818,7 +5785,6 @@ SfxStringItem StatusDocPos SID_STATUS_DOCPOS RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -5839,7 +5805,6 @@ SfxStringItem RowColSelCount SID_ROWCOL_SELCOUNT RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -5861,7 +5826,6 @@ SfxStringItem StatusFunction SID_STATUS_SUM RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -5903,7 +5867,6 @@ SfxStringItem StatusPageStyle SID_STATUS_PAGESTYLE RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -5945,7 +5908,6 @@ SfxUInt16Item StatusSelectionMode SID_STATUS_SELMODE RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -5967,7 +5929,6 @@ SfxUInt16Item StatusSelectionModeExp SID_STATUS_SELMODE_ERG RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = TRUE, @@ -5989,7 +5950,6 @@ SfxUInt16Item StatusSelectionModeExt SID_STATUS_SELMODE_ERW RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = TRUE, @@ -6011,7 +5971,6 @@ SfxUInt16Item StatusSelectionModeNorm SID_STATUS_SELMODE_NORM RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -6033,7 +5992,6 @@ SfxInt16Item Table SID_RANGE_TABLE RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -6055,7 +6013,6 @@ SfxInt16Item TableCount SID_TABLES_COUNT RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -6137,7 +6094,6 @@ SfxObjectItem Tables SID_TABLES_GET RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -6280,7 +6236,6 @@ SfxStringItem TextValue SID_RANGE_TEXTVALUE RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -6382,7 +6337,6 @@ SfxBoolItem TraceChangeMode FID_CHG_RECORD RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -6404,7 +6358,6 @@ SfxBoolItem UnderlineDotted SID_ULINE_VAL_DOTTED RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -6426,7 +6379,6 @@ SfxBoolItem UnderlineDouble SID_ULINE_VAL_DOUBLE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -6448,7 +6400,6 @@ SfxBoolItem UnderlineNone SID_ULINE_VAL_NONE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -6470,7 +6421,6 @@ SfxBoolItem UnderlineSingle SID_ULINE_VAL_SINGLE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -6552,7 +6502,6 @@ ScDoubleItem Value SID_RANGE_VALUE RecordAbsolute = FALSE, RecordPerSet; - Readonly = TRUE, /* config: */ AccelConfig = FALSE, @@ -6574,7 +6523,6 @@ SvxVerJustifyItem VerticalAlignment SID_V_ALIGNCELL RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -6596,7 +6544,6 @@ SfxBoolItem InputLineVisible FID_TOGGLEINPUTLINE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -6618,7 +6565,6 @@ SfxBoolItem ViewRowColumnHeaders FID_TOGGLEHEADERS RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -6640,7 +6586,6 @@ SfxBoolItem ToggleFormula FID_TOGGLEFORMULA RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config */ AccelConfig = TRUE, @@ -6663,7 +6608,6 @@ SfxBoolItem ViewValueHighlighting FID_TOGGLESYNTAX RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -6685,7 +6629,6 @@ SfxBoolItem Visible FID_TABLE_VISIBLE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -6707,7 +6650,6 @@ SfxBoolItem WrapText SID_ATTR_ALIGN_LINEBREAK RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -6892,7 +6834,6 @@ ScProtectionAttr Protection SID_SCATTR_PROTECTION RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -6996,7 +6937,6 @@ SvxColorItem TabBgColor FID_TAB_SET_TAB_BG_COLOR RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, // config: AccelConfig = TRUE, @@ -7352,7 +7292,6 @@ SfxUInt16Item NumberFormatType SID_NUMBER_TYPE_FORMAT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index 3d00916..b73886b 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -138,7 +138,6 @@ interface TableEditView { SbxObject SearchSettings [ - Readonly ; ] SbxObject Table diff --git a/sd/sdi/sdnew.sdi b/sd/sdi/sdnew.sdi index 054e376..ebc46c0 100644 --- a/sd/sdi/sdnew.sdi +++ b/sd/sdi/sdnew.sdi @@ -26,7 +26,6 @@ SfxBoolItem VerticalTextFitToSizeTool SID_TEXT_FITTOSIZE_VERTICAL Toggle = FALSE, Container = FALSE, - Readonly = FALSE, /* config: */ AccelConfig = TRUE, MenuConfig = TRUE, @@ -49,7 +48,6 @@ SvxObjectItem RulerObject SID_RULER_OBJECT /* api: */ Export = TRUE, IsCollection = FALSE, - Readonly = FALSE, RecordAbsolute = FALSE, RecordPerSet; @@ -71,7 +69,6 @@ SfxBoolItem OutputQualityContrast SID_OUTPUT_QUALITY_CONTRAST Container = FALSE, Asynchron; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, MenuConfig = TRUE, diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 48fcbd1..781ce23 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -28,7 +28,6 @@ SfxVoidItem AdvancedMode SID_OBJECT_CHOOSE_MODE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -68,7 +67,6 @@ SfxBoolItem AnimationObjects SID_ANIMATION_OBJECTS RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -89,7 +87,6 @@ SfxBoolItem AnimatorAddObject SID_ANIMATOR_ADD RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -110,7 +107,6 @@ SfxBoolItem AnimatorCreateObject SID_ANIMATOR_CREATE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -131,7 +127,6 @@ SfxBoolItem AnimatorInit SID_ANIMATOR_INIT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -152,7 +147,6 @@ SfxUInt16Item AnimatorState SID_ANIMATOR_STATE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -173,7 +167,6 @@ SfxVoidItem ArrowsToolbox SID_DRAWTBX_ARROWS RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -327,7 +320,6 @@ SfxBoolItem ClickChangeRotation SID_CLICK_CHANGE_ROTATION RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -367,7 +359,6 @@ SfxBoolItem ColorView SID_COLORVIEW RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -406,7 +397,6 @@ SfxBoolItem Cone SID_3D_CONE Container = FALSE, RecordAbsolute = FALSE, - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -445,7 +435,6 @@ SfxBoolItem Connector SID_TOOL_CONNECTOR Container = FALSE, RecordAbsolute = FALSE, - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -466,7 +455,6 @@ SfxBoolItem ConnectorArrowEnd SID_CONNECTOR_ARROW_END RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -487,7 +475,6 @@ SfxBoolItem ConnectorArrows SID_CONNECTOR_ARROWS RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -508,7 +495,6 @@ SfxBoolItem ConnectorArrowStart SID_CONNECTOR_ARROW_START RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -548,7 +534,6 @@ SfxBoolItem ConnectorCircleEnd SID_CONNECTOR_CIRCLE_END RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -569,7 +554,6 @@ SfxBoolItem ConnectorCircles SID_CONNECTOR_CIRCLES RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -590,7 +574,6 @@ SfxBoolItem ConnectorCircleStart SID_CONNECTOR_CIRCLE_START RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -611,7 +594,6 @@ SfxBoolItem ConnectorCurve SID_CONNECTOR_CURVE RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -632,7 +614,6 @@ SfxBoolItem ConnectorCurveArrowEnd SID_CONNECTOR_CURVE_ARROW_END RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -653,7 +634,6 @@ SfxBoolItem ConnectorCurveArrows SID_CONNECTOR_CURVE_ARROWS RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -674,7 +654,6 @@ SfxBoolItem ConnectorCurveArrowStart SID_CONNECTOR_CURVE_ARROW_START RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -695,7 +674,6 @@ SfxBoolItem ConnectorCurveCircleEnd SID_CONNECTOR_CURVE_CIRCLE_END RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -716,7 +694,6 @@ SfxBoolItem ConnectorCurveCircles SID_CONNECTOR_CURVE_CIRCLES RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -737,7 +714,6 @@ SfxBoolItem ConnectorCurveCircleStart SID_CONNECTOR_CURVE_CIRCLE_START RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -758,7 +734,6 @@ SfxBoolItem ConnectorLine SID_CONNECTOR_LINE RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -779,7 +754,6 @@ SfxBoolItem ConnectorLineArrowEnd SID_CONNECTOR_LINE_ARROW_END RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -800,7 +774,6 @@ SfxBoolItem ConnectorLineArrows SID_CONNECTOR_LINE_ARROWS RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -821,7 +794,6 @@ SfxBoolItem ConnectorLineArrowStart SID_CONNECTOR_LINE_ARROW_START RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -842,7 +814,6 @@ SfxBoolItem ConnectorLineCircleEnd SID_CONNECTOR_LINE_CIRCLE_END RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -863,7 +834,6 @@ SfxBoolItem ConnectorLineCircles SID_CONNECTOR_LINE_CIRCLES RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -884,7 +854,6 @@ SfxBoolItem ConnectorLineCircleStart SID_CONNECTOR_LINE_CIRCLE_START RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -905,7 +874,6 @@ SfxBoolItem ConnectorLines SID_CONNECTOR_LINES RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -926,7 +894,6 @@ SfxBoolItem ConnectorLinesArrowEnd SID_CONNECTOR_LINES_ARROW_END RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -947,7 +914,6 @@ SfxBoolItem ConnectorLinesArrows SID_CONNECTOR_LINES_ARROWS RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -968,7 +934,6 @@ SfxBoolItem ConnectorLinesArrowStart SID_CONNECTOR_LINES_ARROW_START RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -989,7 +954,6 @@ SfxBoolItem ConnectorLinesCircleEnd SID_CONNECTOR_LINES_CIRCLE_END RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1010,7 +974,6 @@ SfxBoolItem ConnectorLinesCircles SID_CONNECTOR_LINES_CIRCLES RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1031,7 +994,6 @@ SfxBoolItem ConnectorLinesCircleStart SID_CONNECTOR_LINES_CIRCLE_START RecordAbsolute = FALSE, RecordPerItem; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1052,7 +1014,6 @@ SfxVoidItem ConnectorToolbox SID_DRAWTBX_CONNECTORS RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1207,7 +1168,6 @@ SfxBoolItem CrookRotate SID_OBJECT_CROOK_ROTATE RecordPerSet; Asynchron; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1229,7 +1189,6 @@ SfxBoolItem CrookSlant SID_OBJECT_CROOK_SLANT RecordPerSet; Asynchron; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1251,7 +1210,6 @@ SfxBoolItem CrookStretch SID_OBJECT_CROOK_STRETCH RecordPerSet; Asynchron; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1271,7 +1229,6 @@ SfxBoolItem Cube SID_3D_CUBE Container = FALSE, RecordAbsolute = FALSE, - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1310,7 +1267,6 @@ SfxBoolItem Cylinder SID_3D_CYLINDER Container = FALSE, RecordAbsolute = FALSE, - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1330,7 +1286,6 @@ SfxBoolItem Cyramid SID_3D_PYRAMID Container = FALSE, RecordAbsolute = FALSE, - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1389,7 +1344,6 @@ SfxStringItem DeleteSnapItem SID_DELETE_SNAPITEM RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1428,7 +1382,6 @@ SfxBoolItem DiaMode SID_SLIDE_SORTER_MODE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1468,7 +1421,6 @@ SfxBoolItem DoubleClickTextEdit SID_DOUBLECLICK_TEXTEDIT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1489,7 +1441,6 @@ SfxBoolItem DrawingMode SID_DRAWINGMODE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1567,7 +1518,6 @@ SfxBoolItem CustomAnimation SID_CUSTOM_ANIMATION_PANEL RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1587,7 +1537,6 @@ SfxBoolItem CustomAnimationSchemes SID_CUSTOM_ANIMATION_SCHEMES_PANEL RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1608,7 +1557,6 @@ SfxVoidItem EllipseToolbox SID_DRAWTBX_ELLIPSES RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = TRUE, @@ -1705,7 +1653,6 @@ SfxUInt32Item GetFillStyle SID_GETFILLSTYLE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1745,7 +1692,6 @@ SfxUInt32Item GetLineStyle SID_GETLINESTYLE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1766,7 +1712,6 @@ SfxUInt32Item GetLineWidth SID_GETLINEWIDTH RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1806,7 +1751,6 @@ SfxBoolItem GlueEditMode SID_GLUE_EDITMODE RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1827,7 +1771,6 @@ SfxUInt16Item GlueEscapeDirection SID_GLUE_ESCDIR RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1848,7 +1791,6 @@ SfxBoolItem GlueEscapeDirectionBottom SID_GLUE_ESCDIR_BOTTOM RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1869,7 +1811,6 @@ SfxBoolItem GlueEscapeDirectionLeft SID_GLUE_ESCDIR_LEFT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1890,7 +1831,6 @@ SfxBoolItem GlueEscapeDirectionRight SID_GLUE_ESCDIR_RIGHT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1911,7 +1851,6 @@ SfxBoolItem GlueEscapeDirectionTop SID_GLUE_ESCDIR_TOP RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1932,7 +1871,6 @@ SfxBoolItem GlueHorzAlignCenter SID_GLUE_HORZALIGN_CENTER RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1953,7 +1891,6 @@ SfxBoolItem GlueHorzAlignLeft SID_GLUE_HORZALIGN_LEFT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1974,7 +1911,6 @@ SfxBoolItem GlueHorzAlignRight SID_GLUE_HORZALIGN_RIGHT RecordAbsolute = FALSE, RecordPerSet; - Readonly = FALSE, /* config: */ AccelConfig = FALSE, @@ -1995,7 +1931,6 @@ SfxBoolItem GlueInsertPoint SID_GLUE_INSERT_POINT RecordAbsolute = FALSE, ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits