From 8a79d044c067051bff3729fc14a18ac7382325ec Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 8 Feb 2016 09:02:18 +0200 Subject: [PATCH] remove unused HelpText attribute from *.sdi files Change-Id: I21bcf66c552cd38eaae1bdc85626aa9bd1782ebd --- basctl/sdi/basslots.sdi | 1 - idl/inc/basobj.hxx | 10 ---------- idl/inc/bastype.hxx | 8 -------- idl/inc/globals.hxx | 2 -- idl/source/objects/basobj.cxx | 5 ++--- idl/source/objects/bastype.cxx | 5 ----- idl/source/prj/globals.cxx | 1 - sc/sdi/scslots.sdi | 1 - sc/sdi/tabvwsh.sdi | 5 ----- sd/sdi/sdgslots.sdi | 1 - sd/sdi/sdslots.sdi | 1 - sfx2/sdi/sfxslots.sdi | 1 - starmath/sdi/smslots.sdi | 1 - svx/sdi/svxslots.sdi | 1 - sw/sdi/swslots.sdi | 1 - 15 files changed, 2 insertions(+), 42 deletions(-) diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi index 3074e714a83b..ed588f23f4df 100644 --- a/basctl/sdi/basslots.sdi +++ b/basctl/sdi/basslots.sdi @@ -19,7 +19,6 @@ module BasicIDE [ -HelpText( "BasicIDE" ) SlotIdFile( "basslots.hrc" ) ] { 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" ) ) diff --git a/sc/sdi/scslots.sdi b/sc/sdi/scslots.sdi index b7b26eed39f7..a25edbbef0b5 100644 --- a/sc/sdi/scslots.sdi +++ b/sc/sdi/scslots.sdi @@ -19,7 +19,6 @@ module StarCalc [ -HelpText( "StarDivision StarCalc" ), SlotIdFile( "scslots.hrc" ) ModulePrefix( "Sc" ) ] diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index 4597f16dee25..9faeb47b1429 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -223,7 +223,6 @@ interface DataPilotTables interface DataPilotTable { SbxObject DataPilotFields SID_PIVOT_FIELDS - [ HelpText = "" ; ] } interface DataPilotFields @@ -233,11 +232,8 @@ interface DataPilotFields interface DataPilotField { String FieldName SID_PFIELD_NAME - [ HelpText = "" ; ] UINT16 Orientation SID_PFIELD_ORIENTATION - [ HelpText = "" ; ] UINT16 Function SID_PFIELD_FUNCTION - [ HelpText = "" ; ] } @@ -248,7 +244,6 @@ shell ScTabViewShell import Tables "ActiveDocument.Tables"; import BaseSelection; import TableEditView; -// import SearchSettings; SID_STATUS_PAGESTYLE [ ExecMethod = Execute; StateMethod = GetState; ] diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index a28b8e8410ad..dcd94495d1da 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -18,7 +18,6 @@ module StarDraw [ -HelpText( "StarDraw Application" ) SlotIdFile( "sdslots.hrc" ) ModulePrefix( "Sd" ) ] diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index 57e9bbcc7a6f..22a9317eef25 100644 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -19,7 +19,6 @@ module StarDraw [ -HelpText( "StarDraw Application" ) SlotIdFile( "sdslots.hrc" ) ModulePrefix( "Sd" ) ] diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi index f7e9f87f0974..0f96f2406318 100644 --- a/sfx2/sdi/sfxslots.sdi +++ b/sfx2/sdi/sfxslots.sdi @@ -19,7 +19,6 @@ module StarApplicationFrame [ -HelpText( "StarDivision Application Framework" ), SlotIdFile( "sfx2/sfx.hrc" ) ] { diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index 49144107fde0..14ee77d58c54 100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi @@ -19,7 +19,6 @@ module StarMath [ - HelpText ( "StarMath Application" ) SlotIdFile ( "starmath.hrc" ) SlotIdFile ( "editeng/editids.hrc" ) SlotIdFile ( "sfx2/sfxsids.hrc" ) diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi index ba729718da4d..b29a9026b636 100644 --- a/svx/sdi/svxslots.sdi +++ b/svx/sdi/svxslots.sdi @@ -18,7 +18,6 @@ module SvxItems [ -HelpText( "Svx-Items" ) SlotIdFile( "svxslots.hrc" ) ] { diff --git a/sw/sdi/swslots.sdi b/sw/sdi/swslots.sdi index 9b584603cff3..d5a89f2ffddb 100644 --- a/sw/sdi/swslots.sdi +++ b/sw/sdi/swslots.sdi @@ -19,7 +19,6 @@ module StarWriter [ -HelpText( "StarWriter Application" ) SlotIdFile( "swslots.hrc" ) ModulePrefix( "Sw" ) ]