Kaydet (Commit) b5cf88fa authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

remove unused ConfigName from .SDI files

Change-Id: I2d47d479e4b5b4ef63e13b8a22d9c6b62e9b3209
Reviewed-on: https://gerrit.libreoffice.org/22101Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst ccbed01b
...@@ -90,7 +90,6 @@ protected: ...@@ -90,7 +90,6 @@ protected:
SvString aName; SvString aName;
SvHelpContext aHelpContext; SvHelpContext aHelpContext;
SvHelpText aHelpText; SvHelpText aHelpText;
SvString aConfigName;
SvString aDescription; SvString aDescription;
bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
...@@ -109,7 +108,6 @@ public: ...@@ -109,7 +108,6 @@ public:
virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr ); virtual bool SetName( const OString& rName, SvIdlDataBase * = nullptr );
virtual const SvString & GetName() const { return aName; } virtual const SvString & GetName() const { return aName; }
virtual const SvString & GetHelpText() const { return aHelpText; } virtual const SvString & GetHelpText() const { return aHelpText; }
virtual const SvString & GetConfigName() const{ return aConfigName; }
virtual const SvString& GetDescription() const{ return aDescription; } virtual const SvString& GetDescription() const{ return aDescription; }
virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
...@@ -163,14 +161,6 @@ public: ...@@ -163,14 +161,6 @@ public:
: aRef->GetHelpText(); : aRef->GetHelpText();
} }
const SvString & GetConfigName() const override
{
return ( !aRef.Is()
|| !SvMetaObject::GetConfigName().getString().isEmpty() )
? SvMetaObject::GetConfigName()
: aRef->GetConfigName();
}
const SvString & GetDescription() const override const SvString & GetDescription() const override
{ {
return ( !aRef.Is() return ( !aRef.Is()
......
...@@ -92,7 +92,6 @@ struct SvGlobalHashNames ...@@ -92,7 +92,6 @@ struct SvGlobalHashNames
SvStringHashEntryRef MM_ImageReflection; SvStringHashEntryRef MM_ImageReflection;
SvStringHashEntryRef MM_IsCollection; SvStringHashEntryRef MM_IsCollection;
SvStringHashEntryRef MM_ReadOnlyDoc; SvStringHashEntryRef MM_ReadOnlyDoc;
SvStringHashEntryRef MM_ConfigName;
SvStringHashEntryRef MM_union; SvStringHashEntryRef MM_union;
SvStringHashEntryRef MM_struct; SvStringHashEntryRef MM_struct;
SvStringHashEntryRef MM_typedef; SvStringHashEntryRef MM_typedef;
...@@ -187,7 +186,6 @@ HASH_INLINE(ImageRotation) ...@@ -187,7 +186,6 @@ HASH_INLINE(ImageRotation)
HASH_INLINE(ImageReflection) HASH_INLINE(ImageReflection)
HASH_INLINE(IsCollection) HASH_INLINE(IsCollection)
HASH_INLINE(ReadOnlyDoc) HASH_INLINE(ReadOnlyDoc)
HASH_INLINE(ConfigName)
HASH_INLINE(union) HASH_INLINE(union)
HASH_INLINE(struct) HASH_INLINE(struct)
HASH_INLINE(typedef) HASH_INLINE(typedef)
......
...@@ -99,7 +99,6 @@ void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & rBase, ...@@ -99,7 +99,6 @@ void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & rBase,
aHelpContext.ReadSvIdl( rBase, SvHash_HelpContext(), rInStm ); aHelpContext.ReadSvIdl( rBase, SvHash_HelpContext(), rInStm );
aHelpText.ReadSvIdl( rBase, rInStm ); aHelpText.ReadSvIdl( rBase, rInStm );
aConfigName.ReadSvIdl( SvHash_ConfigName(), rInStm );
aDescription.ReadSvIdl( SvHash_Description(), rInStm ); aDescription.ReadSvIdl( SvHash_Description(), rInStm );
} }
......
...@@ -119,7 +119,6 @@ SvGlobalHashNames::SvGlobalHashNames() ...@@ -119,7 +119,6 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(ImageReflection) A_ENTRY(ImageReflection)
A_ENTRY(IsCollection) A_ENTRY(IsCollection)
A_ENTRY(ReadOnlyDoc) A_ENTRY(ReadOnlyDoc)
A_ENTRY(ConfigName)
A_ENTRY(union) A_ENTRY(union)
A_ENTRY(struct) A_ENTRY(struct)
A_ENTRY(typedef) A_ENTRY(typedef)
......
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