Skip to content

C
core
Kaydet (Commit) d4c6a388 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:mergeclasses merge SvMetaObject with SvMetaName 

Change-Id: I8c65ad9a5e2141b6fdf578e1361f8685d2f8517e
üst 42b0440d
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 73 deletions
idl/inc/basobj.hxx
Dosyayı görüntüle @ d4c6a388
...@@ -32,8 +32,23 @@ typedef SvMetaObject * (*CreateMetaObjectType)(); ...@@ -32,8 +32,23 @@ typedef SvMetaObject * (*CreateMetaObjectType)();
#define C_PREF "C_" #define C_PREF "C_"
class SvMetaObjectMemberList : public SvRefMemberList<SvMetaObject *> {};
class SvMetaObject : public SvRttiBase 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: public:
TYPEINFO_OVERRIDE(); TYPEINFO_OVERRIDE();
SvMetaObject(); SvMetaObject();
...@@ -42,14 +57,17 @@ public: ...@@ -42,14 +57,17 @@ public:
static void Back2Delemitter( SvStream & ); static void Back2Delemitter( SvStream & );
static void WriteStars( 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 bool Test( SvIdlDataBase &, SvTokenStream & rInStm );
virtual ~SvMetaObject() {} virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
}; };
class SvMetaObjectMemberList : public SvRefMemberList<SvMetaObject *> {};
class SvMetaObjectMemberStack class SvMetaObjectMemberStack
{ {
SvMetaObjectMemberList aList; SvMetaObjectMemberList aList;
...@@ -68,39 +86,9 @@ public: ...@@ -68,39 +86,9 @@ public:
} }
}; };
class SvMetaName : public SvMetaObject class SvMetaNameMemberList : public SvRefMemberList<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<SvMetaName *> {};
class SvMetaReference : public SvMetaName class SvMetaReference : public SvMetaObject
{ {
protected: protected:
tools::SvRef<SvMetaReference> aRef; tools::SvRef<SvMetaReference> aRef;
...@@ -111,32 +99,32 @@ public: ...@@ -111,32 +99,32 @@ public:
const SvString & GetName() const SAL_OVERRIDE const SvString & GetName() const SAL_OVERRIDE
{ {
return ( !aRef.Is() return ( !aRef.Is()
|| !SvMetaName::GetName().getString().isEmpty() ) || !SvMetaObject::GetName().getString().isEmpty() )
? SvMetaName::GetName() ? SvMetaObject::GetName()
: aRef->GetName(); : aRef->GetName();
} }
const SvString & GetHelpText() const SAL_OVERRIDE const SvString & GetHelpText() const SAL_OVERRIDE
{ {
return ( !aRef.Is() return ( !aRef.Is()
|| !SvMetaName::GetHelpText().getString().isEmpty() ) || !SvMetaObject::GetHelpText().getString().isEmpty() )
? SvMetaName::GetHelpText() ? SvMetaObject::GetHelpText()
: aRef->GetHelpText(); : aRef->GetHelpText();
} }
const SvString & GetConfigName() const SAL_OVERRIDE const SvString & GetConfigName() const SAL_OVERRIDE
{ {
return ( !aRef.Is() return ( !aRef.Is()
|| !SvMetaName::GetConfigName().getString().isEmpty() ) || !SvMetaObject::GetConfigName().getString().isEmpty() )
? SvMetaName::GetConfigName() ? SvMetaObject::GetConfigName()
: aRef->GetConfigName(); : aRef->GetConfigName();
} }
const SvString & GetDescription() const SAL_OVERRIDE const SvString & GetDescription() const SAL_OVERRIDE
{ {
return ( !aRef.Is() return ( !aRef.Is()
|| !SvMetaName::GetDescription().getString().isEmpty() ) || !SvMetaObject::GetDescription().getString().isEmpty() )
? SvMetaName::GetDescription() ? SvMetaObject::GetDescription()
: aRef->GetDescription(); : aRef->GetDescription();
} }
SvMetaReference * GetRef() const { return aRef; } SvMetaReference * GetRef() const { return aRef; }
......
idl/inc/types.hxx
Dosyayı görüntüle @ d4c6a388
...@@ -182,7 +182,7 @@ public: ...@@ -182,7 +182,7 @@ public:
class SvMetaTypeStringMemberList : public SvRefMemberList<SvMetaTypeString *> {}; class SvMetaTypeStringMemberList : public SvRefMemberList<SvMetaTypeString *> {};
class SvMetaEnumValue : public SvMetaName class SvMetaEnumValue : public SvMetaObject
{ {
public: public:
TYPEINFO_OVERRIDE(); TYPEINFO_OVERRIDE();
......
idl/source/objects/basobj.cxx
Dosyayı görüntüle @ d4c6a388
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
#include <globals.hxx> #include <globals.hxx>
#include <database.hxx> #include <database.hxx>
TYPEINIT1( SvMetaObject, SvRttiBase )
SvMetaObject::SvMetaObject()
{
}
void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab ) void SvMetaObject::WriteTab( SvStream & rOutStm, sal_uInt16 nTab )
{ {
while( nTab-- ) while( nTab-- )
...@@ -67,23 +62,18 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm ) ...@@ -67,23 +62,18 @@ void SvMetaObject::Back2Delemitter( SvStream & rOutStm )
rOutStm.Seek( nPos ); rOutStm.Seek( nPos );
} }
bool SvMetaObject::ReadSvIdl( SvIdlDataBase &, SvTokenStream & ) TYPEINIT1( SvMetaObject, SvRttiBase );
{ SvMetaObject::SvMetaObject()
return false;
}
TYPEINIT1( SvMetaName, SvMetaObject );
SvMetaName::SvMetaName()
{ {
} }
bool SvMetaName::SetName( const OString& rName, SvIdlDataBase * ) bool SvMetaObject::SetName( const OString& rName, SvIdlDataBase * )
{ {
aName.setString(rName); aName.setString(rName);
return true; return true;
} }
bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase, bool SvMetaObject::ReadNameSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm ) SvTokenStream & rInStm )
{ {
sal_uInt32 nTokPos = rInStm.Tell(); sal_uInt32 nTokPos = rInStm.Tell();
...@@ -98,7 +88,7 @@ bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase, ...@@ -98,7 +88,7 @@ bool SvMetaName::ReadNameSvIdl( SvIdlDataBase & rBase,
return false; return false;
} }
void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase, void SvMetaObject::ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm ) SvTokenStream & rInStm )
{ {
sal_uInt32 nTokPos = rInStm.Tell(); sal_uInt32 nTokPos = rInStm.Tell();
...@@ -114,7 +104,7 @@ void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase, ...@@ -114,7 +104,7 @@ void SvMetaName::ReadAttributesSvIdl( SvIdlDataBase & rBase,
aDescription.ReadSvIdl( SvHash_Description(), rInStm ); aDescription.ReadSvIdl( SvHash_Description(), rInStm );
} }
void SvMetaName::DoReadContextSvIdl( SvIdlDataBase & rBase, void SvMetaObject::DoReadContextSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm, char cDel ) SvTokenStream & rInStm, char cDel )
{ {
sal_uInt32 nBeginPos = 0; // can not happen with Tell sal_uInt32 nBeginPos = 0; // can not happen with Tell
...@@ -129,16 +119,16 @@ void SvMetaName::DoReadContextSvIdl( SvIdlDataBase & rBase, ...@@ -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; return true;
} }
bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) bool SvMetaObject::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{ {
sal_uInt32 nTokPos = rInStm.Tell(); sal_uInt32 nTokPos = rInStm.Tell();
bool bOk = true; bool bOk = true;
...@@ -168,7 +158,7 @@ bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) ...@@ -168,7 +158,7 @@ bool SvMetaName::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
return bOk; return bOk;
} }
TYPEINIT1( SvMetaReference, SvMetaName ); TYPEINIT1( SvMetaReference, SvMetaObject );
SvMetaReference::SvMetaReference() SvMetaReference::SvMetaReference()
{ {
......
idl/source/objects/module.cxx
Dosyayı görüntüle @ d4c6a388
...@@ -225,7 +225,7 @@ bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) ...@@ -225,7 +225,7 @@ bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{ {
// set pointer to itself // set pointer to itself
SetModule( rBase ); SetModule( rBase );
bOk = SvMetaName::ReadSvIdl( rBase, rInStm ); bOk = SvMetaObject::ReadSvIdl( rBase, rInStm );
} }
rBase.GetStack().Pop(); // remove from stack rBase.GetStack().Pop(); // remove from stack
} }
......
idl/source/objects/object.cxx
Dosyayı görüntüle @ d4c6a388
...@@ -164,7 +164,7 @@ bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) ...@@ -164,7 +164,7 @@ bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
if( bOk ) if( bOk )
{ {
rBase.Write(OString('.')); rBase.Write(OString('.'));
bOk = SvMetaName::ReadSvIdl( rBase, rInStm ); bOk = SvMetaObject::ReadSvIdl( rBase, rInStm );
} }
if( bOk ) if( bOk )
return bOk; return bOk;
......
idl/source/objects/slot.cxx
Dosyayı görüntüle @ d4c6a388
...@@ -433,7 +433,7 @@ bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm ) ...@@ -433,7 +433,7 @@ bool SvMetaSlot::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{ {
SetRef( pKnownSlot ); SetRef( pKnownSlot );
SetName( pKnownSlot->GetName().getString(), &rBase ); SetName( pKnownSlot->GetName().getString(), &rBase );
bOk = SvMetaName::ReadSvIdl( rBase, rInStm ); bOk = SvMetaObject::ReadSvIdl( rBase, rInStm );
} }
else else
{ {
......
idl/source/objects/types.cxx
Dosyayı görüntüle @ d4c6a388
...@@ -160,7 +160,7 @@ bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase, ...@@ -160,7 +160,7 @@ bool SvMetaAttribute::ReadSvIdl( SvIdlDataBase & rBase,
bOk = aType->ReadMethodArgs( rBase, rInStm ); bOk = aType->ReadMethodArgs( rBase, rInStm );
} }
if( bOk ) if( bOk )
bOk = SvMetaName::ReadSvIdl( rBase, rInStm ); bOk = SvMetaObject::ReadSvIdl( rBase, rInStm );
} }
else else
{ {
...@@ -664,7 +664,7 @@ SvMetaTypeString::SvMetaTypeString() ...@@ -664,7 +664,7 @@ SvMetaTypeString::SvMetaTypeString()
{ {
} }
TYPEINIT1( SvMetaEnumValue, SvMetaName ); TYPEINIT1( SvMetaEnumValue, SvMetaObject );
SvMetaEnumValue::SvMetaEnumValue() SvMetaEnumValue::SvMetaEnumValue()
{ {
} }
...@@ -730,7 +730,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase, ...@@ -730,7 +730,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm )
&& GetType() == TYPE_ENUM ) && GetType() == TYPE_ENUM )
{ {
if( SvMetaName::ReadSvIdl( rBase, rInStm ) ) if( SvMetaObject::ReadSvIdl( rBase, rInStm ) )
return true; return true;
} }
rInStm.Seek( nTokPos ); rInStm.Seek( nTokPos );
......
mergeclasses.results
Dosyayı görüntüle @ d4c6a388
...@@ -80,7 +80,6 @@ merge SfxUndoListener with framework::UndoManagerHelper_Impl ...@@ -80,7 +80,6 @@ merge SfxUndoListener with framework::UndoManagerHelper_Impl
merge StarSymbolToMSMultiFont with StarSymbolToMSMultiFontImpl merge StarSymbolToMSMultiFont with StarSymbolToMSMultiFontImpl
merge StgReader with WW8Reader merge StgReader with WW8Reader
merge SvListView with SvTreeListBox merge SvListView with SvTreeListBox
merge SvMetaObject with SvMetaName
merge SvxNodeIdx with EditNodeIdx merge SvxNodeIdx with EditNodeIdx
merge SvxPosition with EditPosition merge SvxPosition with EditPosition
merge SvxShapeMaster with SdXShape merge SvxShapeMaster with SdXShape
......
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