Kaydet (Commit) 7f5de243 authored tarafından Noel Grandin's avatar Noel Grandin

remove unused Default from .SDI files

Change-Id: I253174197e2c10765f9b1e8cff46178854fe3495
üst c8c856bd
...@@ -62,7 +62,6 @@ struct SvGlobalHashNames ...@@ -62,7 +62,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_item; SvStringHashEntryRef MM_item;
SvStringHashEntryRef MM_PseudoSlots; SvStringHashEntryRef MM_PseudoSlots;
SvStringHashEntryRef MM_map; SvStringHashEntryRef MM_map;
SvStringHashEntryRef MM_Default;
SvStringHashEntryRef MM_import; SvStringHashEntryRef MM_import;
SvStringHashEntryRef MM_SlotIdFile; SvStringHashEntryRef MM_SlotIdFile;
SvStringHashEntryRef MM_ItemName; SvStringHashEntryRef MM_ItemName;
...@@ -145,7 +144,6 @@ HASH_INLINE(char) ...@@ -145,7 +144,6 @@ HASH_INLINE(char)
HASH_INLINE(BYTE) HASH_INLINE(BYTE)
HASH_INLINE(item) HASH_INLINE(item)
HASH_INLINE(PseudoSlots) HASH_INLINE(PseudoSlots)
HASH_INLINE(Default)
HASH_INLINE(import) HASH_INLINE(import)
HASH_INLINE(SlotIdFile) HASH_INLINE(SlotIdFile)
HASH_INLINE(include) HASH_INLINE(include)
......
...@@ -31,7 +31,6 @@ class SvMetaSlot : public SvMetaAttribute ...@@ -31,7 +31,6 @@ class SvMetaSlot : public SvMetaAttribute
SvIdentifier aConfigId; SvIdentifier aConfigId;
SvIdentifier aExecMethod; SvIdentifier aExecMethod;
SvIdentifier aStateMethod; SvIdentifier aStateMethod;
SvIdentifier aDefault;
SvBOOL aPseudoSlots; SvBOOL aPseudoSlots;
SvBOOL aVolatile; SvBOOL aVolatile;
...@@ -121,18 +120,17 @@ public: ...@@ -121,18 +120,17 @@ public:
SvMetaSlot(); SvMetaSlot();
SvMetaSlot( SvMetaType * pType ); SvMetaSlot( SvMetaType * pType );
virtual bool IsVariable() const override; virtual bool IsVariable() const override;
virtual bool IsMethod() const override; virtual bool IsMethod() const override;
virtual OString GetMangleName( bool bVariable ) const override; virtual OString GetMangleName( bool bVariable ) const override;
SvMetaAttribute * GetMethod() const; SvMetaAttribute * GetMethod() const;
SvMetaType * GetSlotType() const; SvMetaType * GetSlotType() const;
const OString& GetGroupId() const; const OString& GetGroupId() const;
const OString& GetConfigId() const; const OString& GetConfigId() const;
const OString& GetExecMethod() const; const OString& GetExecMethod() const;
const OString& GetStateMethod() const; const OString& GetStateMethod() const;
const OString& GetDefault() const; const OString& GetDisableFlags() const;
const OString& GetDisableFlags() const;
bool GetPseudoSlots() const; bool GetPseudoSlots() const;
bool GetVolatile() const; bool GetVolatile() const;
bool GetToggle() const; bool GetToggle() const;
...@@ -145,8 +143,8 @@ public: ...@@ -145,8 +143,8 @@ public:
bool GetNoRecord() const; bool GetNoRecord() const;
bool GetRecordAbsolute() const; bool GetRecordAbsolute() const;
const OString& GetPseudoPrefix() const; const OString& GetPseudoPrefix() const;
const OString& GetUnoName() const; const OString& GetUnoName() const;
bool GetMenuConfig() const; bool GetMenuConfig() const;
bool GetToolBoxConfig() const; bool GetToolBoxConfig() const;
bool GetAccelConfig() const; bool GetAccelConfig() const;
......
...@@ -119,11 +119,6 @@ const OString& SvMetaSlot::GetStateMethod() const ...@@ -119,11 +119,6 @@ const OString& SvMetaSlot::GetStateMethod() const
if( !aStateMethod.getString().isEmpty() || !GetRef() ) return aStateMethod.getString(); if( !aStateMethod.getString().isEmpty() || !GetRef() ) return aStateMethod.getString();
return static_cast<SvMetaSlot *>(GetRef())->GetStateMethod(); 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 bool SvMetaSlot::GetPseudoSlots() const
{ {
if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots; if( aPseudoSlots.IsSet() || !GetRef() ) return aPseudoSlots;
...@@ -238,7 +233,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, ...@@ -238,7 +233,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm ); SvMetaAttribute::ReadAttributesSvIdl( rBase, rInStm );
bool bOk = false; bool bOk = false;
bOk |= aDefault.ReadSvIdl( SvHash_Default(), rInStm );
bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm ); bOk |= aPseudoSlots.ReadSvIdl( SvHash_PseudoSlots(), rInStm );
bOk |= aGroupId.ReadSvIdl( SvHash_GroupId(), rInStm ); bOk |= aGroupId.ReadSvIdl( SvHash_GroupId(), rInStm );
bOk |= aExecMethod.ReadSvIdl( SvHash_ExecMethod(), rInStm ); bOk |= aExecMethod.ReadSvIdl( SvHash_ExecMethod(), rInStm );
......
...@@ -77,7 +77,6 @@ char const * SyntaxStrings[] = { ...@@ -77,7 +77,6 @@ char const * SyntaxStrings[] = {
"\t\tAccelConfig, MenuConfig, ToolbarConfig", "\t\tAccelConfig, MenuConfig, ToolbarConfig",
"\t\tAutoUpdate", "\t\tAutoUpdate",
"\t\tContainer", "\t\tContainer",
"\t\tDefault = Identifier",
"\t\tExecMethod = Identifier", "\t\tExecMethod = Identifier",
"\t\tExport*", "\t\tExport*",
"\t\tFastCall", "\t\tFastCall",
......
...@@ -89,7 +89,6 @@ SvGlobalHashNames::SvGlobalHashNames() ...@@ -89,7 +89,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(item) A_ENTRY(item)
A_ENTRY(PseudoSlots) A_ENTRY(PseudoSlots)
A_ENTRY(map) A_ENTRY(map)
A_ENTRY(Default)
A_ENTRY(import) A_ENTRY(import)
A_ENTRY(SlotIdFile) A_ENTRY(SlotIdFile)
A_ENTRY(ItemName) A_ENTRY(ItemName)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment