diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-04 11:34:25 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-05 08:01:43 +0200 |
commit | 7f5de2436a5c51ee8dec38a9b04f4a1b3589e361 (patch) | |
tree | 4b8017ef8ce1934d2dfb7df1f9595c6ee303f175 | |
parent | c8c856bd73c3ce051a2564b30e5d01159d39676c (diff) |
remove unused Default from .SDI files
Change-Id: I253174197e2c10765f9b1e8cff46178854fe3495
-rw-r--r-- | idl/inc/globals.hxx | 2 | ||||
-rw-r--r-- | idl/inc/slot.hxx | 22 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 6 | ||||
-rw-r--r-- | idl/source/prj/command.cxx | 1 | ||||
-rw-r--r-- | idl/source/prj/globals.cxx | 1 |
5 files changed, 10 insertions, 22 deletions
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx index 6cdbe087652d..35026a6328ab 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 42b90db63ab5..7be120563d6a 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 3b8e59ccb634..26ceba001413 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 8a42ef19ec25..f2181ec6d830 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 3f20a2ce8103..bcb82b5cee06 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) |