diff options
author | Noel Grandin <noel@peralex.com> | 2016-02-08 09:02:18 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-02-08 14:00:37 +0200 |
commit | 8a79d044c067051bff3729fc14a18ac7382325ec (patch) | |
tree | 688e4306cdb1e1465a7d8b48b1f9cf2b91277570 /idl | |
parent | aa9b67dda02bc596988196261205619e10a08f6f (diff) |
remove unused HelpText attribute from *.sdi files
Change-Id: I21bcf66c552cd38eaae1bdc85626aa9bd1782ebd
Diffstat (limited to 'idl')
-rw-r--r-- | idl/inc/basobj.hxx | 10 | ||||
-rw-r--r-- | idl/inc/bastype.hxx | 8 | ||||
-rw-r--r-- | idl/inc/globals.hxx | 2 | ||||
-rw-r--r-- | idl/source/objects/basobj.cxx | 5 | ||||
-rw-r--r-- | idl/source/objects/bastype.cxx | 5 | ||||
-rw-r--r-- | idl/source/prj/globals.cxx | 1 |
6 files changed, 2 insertions, 29 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 6db8ca00a9eb..dd01e85af7b6 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -86,7 +86,6 @@ class SvMetaObject : public SvRttiBase { protected: SvString aName; - SvHelpText aHelpText; bool ReadNameSvIdl( SvTokenStream & rInStm ); void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); @@ -102,7 +101,6 @@ public: void SetName( const OString& rName ); virtual const SvString & GetName() const { return aName; } - virtual const SvString & GetHelpText() const { return aHelpText; } virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); @@ -145,14 +143,6 @@ public: : aRef->GetName(); } - const SvString & GetHelpText() const override - { - return ( !aRef.Is() - || !SvMetaObject::GetHelpText().getString().isEmpty() ) - ? SvMetaObject::GetHelpText() - : aRef->GetHelpText(); - } - SvMetaReference * GetRef() const { return aRef; } void SetRef( SvMetaReference * pRef ) { aRef = pRef; } diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index f571a029b172..220c5360b752 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -86,14 +86,6 @@ public: }; -class SvHelpText : public SvString -{ -public: - SvHelpText() {} - void ReadSvIdl( SvIdlDataBase &, 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 a78e3aaa3d55..7b8858cdddf0 100644 --- a/idl/inc/globals.hxx +++ b/idl/inc/globals.hxx @@ -30,7 +30,6 @@ struct SvGlobalHashNames SvStringHashEntryRef MM_module; SvStringHashEntryRef MM_interface; SvStringHashEntryRef MM_String; - SvStringHashEntryRef MM_HelpText; SvStringHashEntryRef MM_void; SvStringHashEntryRef MM_shell; SvStringHashEntryRef MM_Toggle; @@ -99,7 +98,6 @@ inline SvStringHashEntry * SvHash_##Name() \ HASH_INLINE(module) HASH_INLINE(interface) -HASH_INLINE(HelpText) HASH_INLINE(shell) HASH_INLINE(Toggle) HASH_INLINE(AutoUpdate) diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index 8bc07bd2499e..3ccbb36ae7d5 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -87,10 +87,9 @@ bool SvMetaObject::ReadNameSvIdl( SvTokenStream & rInStm ) return false; } -void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ) +void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & , + SvTokenStream & ) { - aHelpText.ReadSvIdl( rBase, rInStm ); } void SvMetaObject::DoReadContextSvIdl( SvIdlDataBase & rBase, diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index ced082f00708..a7b6c3dfe89b 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -138,9 +138,4 @@ bool SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ) return false; } -void SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) -{ - SvString::ReadSvIdl( SvHash_HelpText(), rInStm ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 439e7d47b4bd..efca4afcf212 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -57,7 +57,6 @@ SvGlobalHashNames::SvGlobalHashNames() : MM_module( INS( "module" ) ) , MM_interface( INS( "interface" ) ) , MM_String( INS( "String" ) ) - , MM_HelpText( INS( "HelpText" ) ) , MM_void( INS( "void" ) ) , MM_shell( INS( "shell" ) ) , MM_Toggle( INS( "Toggle" ) ) |