From d4c6a3883a38187effdd7414a0a07a9a2d3d026d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 28 Aug 2015 11:53:11 +0200 Subject: loplugin:mergeclasses merge SvMetaObject with SvMetaName Change-Id: I8c65ad9a5e2141b6fdf578e1361f8685d2f8517e --- idl/inc/basobj.hxx | 78 ++++++++++++++++++------------------------- idl/inc/types.hxx | 2 +- idl/source/objects/basobj.cxx | 30 ++++++----------- idl/source/objects/module.cxx | 2 +- idl/source/objects/object.cxx | 2 +- idl/source/objects/slot.cxx | 2 +- idl/source/objects/types.cxx | 6 ++-- 7 files changed, 50 insertions(+), 72 deletions(-) (limited to 'idl') diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 89ca0a61b56b..71dc13675b46 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -32,8 +32,23 @@ typedef SvMetaObject * (*CreateMetaObjectType)(); #define C_PREF "C_" +class SvMetaObjectMemberList : public SvRefMemberList {}; + class SvMetaObject : public SvRttiBase { +protected: + SvString aName; + SvHelpContext aHelpContext; + SvHelpText aHelpText; + SvString aConfigName; + SvString aDescription; + + bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm, + char c = '\0' ); + virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, + SvTokenStream & rInStm ); public: TYPEINFO_OVERRIDE(); SvMetaObject(); @@ -42,14 +57,17 @@ public: static void Back2Delemitter( SvStream & ); static void WriteStars( SvStream & ); - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ); + const SvHelpContext& GetHelpContext() const { return aHelpContext; } + virtual const SvString & GetName() const { return aName; } + virtual const SvString & GetHelpText() const { return aHelpText; } + virtual const SvString & GetConfigName() const{ return aConfigName; } + virtual const SvString& GetDescription() const{ return aDescription; } -protected: - virtual ~SvMetaObject() {} + virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); + virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); }; -class SvMetaObjectMemberList : public SvRefMemberList {}; - class SvMetaObjectMemberStack { SvMetaObjectMemberList aList; @@ -68,39 +86,9 @@ public: } }; -class SvMetaName : public SvMetaObject -{ - SvString aName; - SvHelpContext aHelpContext; - SvHelpText aHelpText; - SvString aConfigName; - SvString aDescription; - -protected: - bool ReadNameSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - void DoReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm, - char c = '\0' ); - virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase, - SvTokenStream & rInStm ); -public: - TYPEINFO_OVERRIDE(); - SvMetaName(); - - virtual bool SetName( const OString& rName, SvIdlDataBase * = NULL ); - const SvHelpContext& GetHelpContext() const { return aHelpContext; } - virtual const SvString & GetName() const { return aName; } - virtual const SvString & GetHelpText() const { return aHelpText; } - virtual const SvString & GetConfigName() const{ return aConfigName; } - virtual const SvString& GetDescription() const{ return aDescription; } - - virtual bool Test( SvIdlDataBase &, SvTokenStream & rInStm ); - virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) SAL_OVERRIDE; -}; - -class SvMetaNameMemberList : public SvRefMemberList {}; +class SvMetaNameMemberList : public SvRefMemberList {}; -class SvMetaReference : public SvMetaName +class SvMetaReference : public SvMetaObject { protected: tools::SvRef aRef; @@ -111,32 +99,32 @@ public: const SvString & GetName() const SAL_OVERRIDE { return ( !aRef.Is() - || !SvMetaName::GetName().getString().isEmpty() ) - ? SvMetaName::GetName() + || !SvMetaObject::GetName().getString().isEmpty() ) + ? SvMetaObject::GetName() : aRef->GetName(); } const SvString & GetHelpText() const SAL_OVERRIDE { return ( !aRef.Is() - || !SvMetaName::GetHelpText().getString().isEmpty() ) - ? SvMetaName::GetHelpText() + || !SvMetaObject::GetHelpText().getString().isEmpty() ) + ? SvMetaObject::GetHelpText() : aRef->GetHelpText(); } const SvString & GetConfigName() const SAL_OVERRIDE { return ( !aRef.Is() - || !SvMetaName::GetConfigName().getString().isEmpty() ) - ? SvMetaName::GetConfigName() + || !SvMetaObject::GetConfigName().getString().isEmpty() ) + ? SvMetaObject::GetConfigName() : aRef->GetConfigName(); } const SvString & GetDescription() const SAL_OVERRIDE { return ( !aRef.Is() - || !SvMetaName::GetDescription().getString().isEmpty() ) - ? SvMetaName::GetDescription() + || !SvMetaObject::GetDescription().getString().isEmpty() ) + ? SvMetaObject::GetDescription() : aRef->GetDescription(); } SvMetaReference * GetRef() const { return aRef; } diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 90f358c9a9cd..f1cbcde90fed 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -182,7 +182,7 @@ public: class SvMetaTypeStringMemberList : public SvRefMemberList {}; -class SvMetaEnumValue : public SvMetaName +class SvMetaEnumValue : public SvMetaObject { public: TYPEINFO_OVERRIDE(); diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index bde7d8a1dd03..59a832ecb503 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -28,11 +28,6 @@ #include #include -TYPEINIT1( SvMetaObject, SvRttiBase ) -SvMetaObject::SvMetaObject() -{ -} - void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab ) { while( nTab-- ) @@ -67,23 +62,18 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm ) rOutStm.Seek( nPos ); } -bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & ) -{ - return false; -} - -TYPEINIT1( SvMetaName, SvMetaObject ); -SvMetaName::SvMetaName() +TYPEINIT1( SvMetaObject, SvRttiBase ); +SvMetaObject::SvMetaObject() { } -bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * ) +bool SvMetaObject::SetName( const OString& rName, SvIdlDataBase * ) { aName.setString(rName); return true; } -bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase, +bool SvMetaObject::ReadNameSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); @@ -98,7 +88,7 @@ bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase, return false; } -void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase, +void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); @@ -114,7 +104,7 @@ void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase, aDescription.ReadSvIdl( SvHash_Description(), rInStm ); } -void SvMetaName::DoReadContextSvIdl( SvIdlDataBase & rBase, +void SvMetaObject::DoReadContextSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm, char cDel ) { sal_uInt32 nBeginPos = 0; // can not happen with Tell @@ -129,16 +119,16 @@ void SvMetaName::DoReadContextSvIdl( SvIdlDataBase & rBase, } } -void SvMetaName::ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & ) +void SvMetaObject::ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & ) { } -bool SvMetaName::Test( SvIdlDataBase &, SvTokenStream & ) +bool SvMetaObject::Test( SvIdlDataBase &, SvTokenStream & ) { return true; } -bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) +bool SvMetaObject::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { sal_uInt32 nTokPos = rInStm.Tell(); bool bOk = true; @@ -168,7 +158,7 @@ bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) return bOk; } -TYPEINIT1( SvMetaReference, SvMetaName ); +TYPEINIT1( SvMetaReference, SvMetaObject ); SvMetaReference::SvMetaReference() { diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index c6e29449d8a1..f78390eab8df 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -225,7 +225,7 @@ bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { // set pointer to itself SetModule( rBase ); - bOk = SvMetaName::ReadSvIdl( rBase, rInStm ); + bOk = SvMetaObject::ReadSvIdl( rBase, rInStm ); } rBase.GetStack().Pop(); // remove from stack } diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 38985042df2a..3310770334a1 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -164,7 +164,7 @@ bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) if( bOk ) { rBase.Write(OString('.')); - bOk = SvMetaName::ReadSvIdl( rBase, rInStm ); + bOk = SvMetaObject::ReadSvIdl( rBase, rInStm ); } if( bOk ) return bOk; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 00054c26e8aa..2b1c17265da8 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -433,7 +433,7 @@ bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) { SetRef( pKnownSlot ); SetName( pKnownSlot->GetName().getString(), &rBase ); - bOk = SvMetaName::ReadSvIdl( rBase, rInStm ); + bOk = SvMetaObject::ReadSvIdl( rBase, rInStm ); } else { diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 49549c14f291..cd4c26231741 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -160,7 +160,7 @@ bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase, bOk = aType->ReadMethodArgs( rBase, rInStm ); } if( bOk ) - bOk = SvMetaName::ReadSvIdl( rBase, rInStm ); + bOk = SvMetaObject::ReadSvIdl( rBase, rInStm ); } else { @@ -664,7 +664,7 @@ SvMetaTypeString::SvMetaTypeString() { } -TYPEINIT1( SvMetaEnumValue, SvMetaName ); +TYPEINIT1( SvMetaEnumValue, SvMetaObject ); SvMetaEnumValue::SvMetaEnumValue() { } @@ -730,7 +730,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_ENUM ) { - if( SvMetaName::ReadSvIdl( rBase, rInStm ) ) + if( SvMetaObject::ReadSvIdl( rBase, rInStm ) ) return true; } rInStm.Seek( nTokPos ); -- cgit