mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove SFX_NOTIFY macro

Browse Source 
it has not served any purpose since we switched to using normal C++ RTTI
for the SfxHint objects

Change-Id: Ic81353bcb7863ce892eb75296248ca14d8fd6c86
This commit is contained in:
Noel Grandin
2015-06-24 12:06:34 +02:00
parent 1d1c0632d2
commit 07d85c4499
22 changed files with 60 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
basic/source/classes/sb.cxx
View File

@@ -789,8 +789,7 @@ SbClassModuleObject::~SbClassModuleObject()
pBreaks = NULL;
}
void SbClassModuleObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbClassModuleObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
handleProcedureProperties( rBC, rHint );
}
@@ -2120,8 +2119,7 @@ SbxVariable* BasicCollection::Find( const OUString& rName, SbxClassType t )
return pFind;
}
void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
const SfxHint& rHint, const TypeId& rId2 )
void BasicCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint )
{
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )
@@ -2157,7 +2155,7 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
}
else
{
SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
SbxObject::Notify( rCst, rHint );
}
return;
}
@@ -2175,7 +2173,7 @@ void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
}
}
}
SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
SbxObject::Notify( rCst, rHint );
}
sal_Int32 BasicCollection::implGetIndex( SbxVariable* pIndexVar )

20
basic/source/classes/sbunoobj.cxx
View File

@@ -2026,8 +2026,7 @@ OUString Impl_DumpMethods( SbUnoObject* pUnoObj )
TYPEINIT1(AutomationNamedArgsSbxArray,SbxArray)
// Implementation SbUnoObject
void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbUnoObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
if( bNeedIntrospection )
doIntrospection();
@@ -2326,7 +2325,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
}
else
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}
@@ -3612,8 +3611,7 @@ SbxVariable* SbUnoService::Find( const OUString& rName, SbxClassType )
return pRes;
}
void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbUnoService::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint);
if( pHint )
@@ -3762,7 +3760,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
}
else
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}
@@ -3833,8 +3831,7 @@ SbUnoSingleton::SbUnoSingleton( const OUString& aName_,
QuickInsert( static_cast<SbxVariable*>(xGetMethodRef) );
}
void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbUnoSingleton::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint);
if( pHint )
@@ -3879,7 +3876,7 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
else
{
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}
@@ -5005,8 +5002,7 @@ OUString SbUnoStructRefObject::Impl_DumpProperties()
return aRet.makeStringAndClear();
}
void SbUnoStructRefObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbUnoStructRefObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
if ( !mbMemberCacheInit )
initMemberCache();
@@ -5077,7 +5073,7 @@ void SbUnoStructRefObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCTyp
}
}
else
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}

8
basic/source/classes/sbxmod.cxx
View File

@@ -741,8 +741,7 @@ void SbModule::SetParent( SbxObject* p )
pParent = p;
}
void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint);
if( pHint )
@@ -861,7 +860,7 @@ void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
if( bForwardToSbxObject )
{
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}
}
@@ -2230,8 +2229,7 @@ SbObjModule::Find( const OUString& rName, SbxClassType t )
return pVar;
}
void SbObjModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbObjModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
SbModule::handleProcedureProperties( rBC, rHint );
}

11
basic/source/inc/sbunoobj.hxx
View File

@@ -97,7 +97,7 @@ public:
// give out value
::com::sun::star::uno::Any getUnoAny();
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE;
void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE;
};
class SbUnoObject: public SbxObject
@@ -139,7 +139,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > getIntrospectionAccess() { return mxUnoAccess; }
::com::sun::star::uno::Reference< ::com::sun::star::script::XInvocation > getInvocation() { return mxInvocation; }
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE;
void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE;
bool isNativeCOMObject()
{ return bNativeCOMObject; }
@@ -265,7 +265,7 @@ public:
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE;
void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE;
};
SbUnoService* findUnoService( const OUString& rName );
@@ -304,7 +304,7 @@ public:
SbUnoSingleton( const OUString& aName_,
const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >& xSingletonTypeDesc );
void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& ) SAL_OVERRIDE;
void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE;
};
SbUnoSingleton* findUnoSingleton( const OUString& rName );
@@ -374,8 +374,7 @@ class BasicCollection : public SbxObject
void Initialize();
virtual ~BasicCollection();
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
sal_Int32 implGetIndex( SbxVariable* pIndexVar );
sal_Int32 implGetIndexForName( const OUString& rName );
void CollAdd( SbxArray* pPar_ );

3
basic/source/inc/stdobj.hxx
View File

@@ -32,8 +32,7 @@ class SbiStdObject : public SbxObject
virtual ~SbiStdObject();
using SbxVariable::GetInfo;
static SbxInfo* GetInfo( short );
virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType ) SAL_OVERRIDE;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
public:
SbiStdObject( const OUString&, StarBASIC* );
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;

5
basic/source/runtime/stdobj.cxx
View File

@@ -816,8 +816,7 @@ void SbiStdObject::SetModified( bool )
}
void SbiStdObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbiStdObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint);
@@ -850,7 +849,7 @@ void SbiStdObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
}
}
}
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}

21
basic/source/runtime/stdobj1.cxx
View File

@@ -140,8 +140,7 @@ SbxVariable* SbStdPicture::Find( const OUString& rName, SbxClassType t )
void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbStdPicture::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint);
@@ -150,7 +149,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
if( pHint->GetId() == SBX_HINT_INFOWANTED )
{
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
return;
}
@@ -167,7 +166,7 @@ void SbStdPicture::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
case ATTR_IMP_HEIGHT: PropHeight( pVar, pPar_, bWrite ); return;
}
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}
@@ -267,8 +266,7 @@ SbxVariable* SbStdFont::Find( const OUString& rName, SbxClassType t )
return SbxObject::Find( rName, t );
}
void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbStdFont::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint);
@@ -276,7 +274,7 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
if( pHint->GetId() == SBX_HINT_INFOWANTED )
{
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
return;
}
@@ -296,7 +294,7 @@ void SbStdFont::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
case ATTR_IMP_NAME: PropName( pVar, pPar_, bWrite ); return;
}
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}
@@ -436,8 +434,7 @@ SbxVariable* SbStdClipboard::Find( const OUString& rName, SbxClassType t )
void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
const SfxHint& rHint, const TypeId& rHintType )
void SbStdClipboard::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint);
@@ -445,7 +442,7 @@ void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
if( pHint->GetId() == SBX_HINT_INFOWANTED )
{
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
return;
}
@@ -465,7 +462,7 @@ void SbStdClipboard::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
case METH_SETTEXT: MethSetText( pVar, pPar_, bWrite ); return;
}
SbxObject::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
SbxObject::Notify( rBC, rHint );
}
}

7
basic/source/sbx/sbxcoll.cxx
View File

@@ -114,8 +114,7 @@ SbxVariable* SbxCollection::Find( const OUString& rName, SbxClassType t )
}
}
void SbxCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
const SfxHint& rHint, const TypeId& rId2 )
void SbxCollection::Notify( SfxBroadcaster& rCst, const SfxHint& rHint )
{
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )
@@ -154,12 +153,12 @@ void SbxCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1,
}
else
{
SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
SbxObject::Notify( rCst, rHint );
}
return;
}
}
SbxObject::SFX_NOTIFY( rCst, rId1, rHint, rId2 );
SbxObject::Notify( rCst, rHint );
}
// Default: argument is object

3
basic/source/sbx/sbxobj.cxx
View File

@@ -135,8 +135,7 @@ void SbxObject::Clear()
SetModified( false );
}
void SbxObject::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
const SfxHint& rHint, const TypeId& )
void SbxObject::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p )

3
basic/source/sbx/sbxvar.cxx
View File

@@ -688,8 +688,7 @@ void SbxAlias::Broadcast( sal_uIntPtr nHt )
}
}
void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
const SfxHint& rHint, const TypeId& )
void SbxAlias::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint);
if( p && p->GetId() == SBX_HINT_DYING )