basctl/source/basicide/basidesh.cxx | 3 +--
basctl/source/inc/basidesh.hxx | 3 +--
basic/inc/sbobjmod.hxx | 3 +--
basic/inc/sbstdobj.hxx | 19 ++++++++-----------
basic/source/classes/sb.cxx | 10 ++++------
basic/source/classes/sbunoobj.cxx | 20 ++++++++------------
basic/source/classes/sbxmod.cxx | 8 +++-----
basic/source/inc/sbunoobj.hxx | 11 +++++------
basic/source/inc/stdobj.hxx | 3 +--
basic/source/runtime/stdobj.cxx | 5 ++---
basic/source/runtime/stdobj1.cxx | 21 +++++++++------------
basic/source/sbx/sbxcoll.cxx | 7 +++----
basic/source/sbx/sbxobj.cxx | 3 +--
basic/source/sbx/sbxvar.cxx | 3 +--
include/basic/sbmod.hxx | 5 ++---
include/basic/sbx.hxx | 6 ++----
include/basic/sbxobj.hxx | 3 +--
include/svl/lstner.hxx | 9 +++------
starmath/inc/document.hxx | 3 +--
starmath/inc/symbol.hxx | 3 +--
starmath/source/document.cxx | 3 +--
starmath/source/symbol.cxx | 3 +--
22 files changed, 60 insertions(+), 94 deletions(-)
New commits:
commit 07d85c44998f42545175ee77c192b901b52a30ca
Author: Noel Grandin <n...@peralex.com>
Date: Wed Jun 24 12:06:34 2015 +0200
remove SFX_NOTIFY macro
it has not served any purpose since we switched to using normal C++ RTTI
for the SfxHint objects
Change-Id: Ic81353bcb7863ce892eb75296248ca14d8fd6c86
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index 2501cdb..1ac759b 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -523,8 +523,7 @@ void Shell::ArrangeTabBar()
-void Shell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId&,
- const SfxHint& rHint, const TypeId& )
+void Shell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{
if (GetShell())
{
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index a3794b9..8c45020 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -125,8 +125,7 @@ private:
VclPtr<ModulWindow> ShowActiveModuleWindow( StarBASIC* pBasic );
- 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;
virtual void Activate(bool bMDI) SAL_OVERRIDE;
virtual void Deactivate(bool bMDI) SAL_OVERRIDE;
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index cd673bf..364e8cc 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -41,8 +41,7 @@ public:
SbObjModule( const OUString& rName, const
com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible );
virtual SbxVariable* Find( const OUString& rName, SbxClassType t )
SAL_OVERRIDE;
- 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;
using SbxValue::GetObject;
SbxVariable* GetObject();
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 40cd961..2bfd419 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -41,8 +41,7 @@ protected:
Graphic aGraphic;
virtual ~SbStdPicture();
- 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;
void PropType( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
void PropWidth( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
@@ -70,8 +69,7 @@ protected:
OUString aName;
virtual ~SbStdFont();
- 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;
void PropBold( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
void PropItalic( SbxVariable* pVar, SbxArray* pPar, bool bWrite );
@@ -87,13 +85,13 @@ public:
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
void SetBold( bool bB ) { bBold = bB; }
- bool IsBold() const { return bBold; }
+ bool IsBold() const { return bBold; }
void SetItalic( bool bI ) { bItalic = bI; }
- bool IsItalic() const { return bItalic; }
+ bool IsItalic() const { return bItalic; }
void SetStrikeThrough( bool bS ) { bStrikeThrough = bS; }
- bool IsStrikeThrough() const { return bStrikeThrough; }
+ bool IsStrikeThrough() const { return bStrikeThrough; }
void SetUnderline( bool bU ) { bUnderline = bU; }
- bool IsUnderline() const { return bUnderline; }
+ bool IsUnderline() const { return bUnderline; }
void SetSize( sal_uInt16 nS ) { nSize = nS; }
sal_uInt16 GetSize() const { return nSize; }
void SetFontName( const OUString& rName ) { aName = rName; }
@@ -105,9 +103,8 @@ class BASIC_DLLPUBLIC SbStdClipboard : public SbxObject
{
protected:
- virtual ~SbStdClipboard();
- virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType )
SAL_OVERRIDE;
+ virtual ~SbStdClipboard();
+ virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
SAL_OVERRIDE;
static void MethClear( SbxVariable* pVar, SbxArray* pPar_, bool bWrite
);
static void MethGetData( SbxVariable* pVar, SbxArray* pPar_, bool
bWrite );
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index e1730d7..f89c088 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -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 )
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 9cd21d0..2475e28 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -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 );
}
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 59f4004..a2b6f9a 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -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 );
}
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 12b9cd7..879e0c0 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -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_ );
diff --git a/basic/source/inc/stdobj.hxx b/basic/source/inc/stdobj.hxx
index ccd4d70..619b59c 100644
--- a/basic/source/inc/stdobj.hxx
+++ b/basic/source/inc/stdobj.hxx
@@ -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;
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index f66cb40..05700d6 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -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 );
}
}
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index e64db76..1042265 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -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 );
}
}
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 0946345..5b856ee 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -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
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 69a552c..68be53e 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -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 )
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 780b817..e01c3d4 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -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 )
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index c5a9e16..7b40b1f 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -90,8 +90,7 @@ protected:
virtual bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE;
virtual bool StoreData( SvStream& ) const SAL_OVERRIDE;
virtual bool LoadCompleted() SAL_OVERRIDE;
- 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;
void handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rHint
);
virtual ~SbModule();
public:
@@ -156,7 +155,7 @@ public:
// Overridden to support NameAccess etc.
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
- virtual void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint&
rHint, const TypeId& ) SAL_OVERRIDE;
+ virtual void Notify( SfxBroadcaster&, const SfxHint& rHint ) SAL_OVERRIDE;
SbModule* getClassModule()
{ return mpClassModule; }
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 8410f43..348435a 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -104,8 +104,7 @@ class BASIC_DLLPUBLIC SbxAlias : public SbxVariable, public
SfxListener
SbxVariableRef xAlias;
virtual ~SbxAlias();
virtual void Broadcast( sal_uIntPtr ) SAL_OVERRIDE;
- 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:
SbxAlias( const SbxAlias& );
SbxAlias& operator=( const SbxAlias& );
@@ -221,8 +220,7 @@ class BASIC_DLLPUBLIC SbxCollection : public SbxObject
protected:
virtual ~SbxCollection();
virtual bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE;
- 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;
// Overridable methods (why not pure virtual?):
virtual void CollAdd( SbxArray* pPar );
void CollItem( SbxArray* pPar );
diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx
index 4526f25..1869c61 100644
--- a/include/basic/sbxobj.hxx
+++ b/include/basic/sbxobj.hxx
@@ -40,8 +40,7 @@ protected:
virtual bool LoadData( SvStream&, sal_uInt16 ) SAL_OVERRIDE;
virtual bool StoreData( SvStream& ) const SAL_OVERRIDE;
virtual ~SbxObject();
- 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:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_OBJECT,1);
TYPEINFO_OVERRIDE();
diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index cc1e842..521c197 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
@@ -25,9 +25,6 @@
class SfxBroadcaster;
class SfxHint;
-#define SFX_NOTIFY( rBC, rBCT, rHint, rHintT ) \
- Notify( rBC, rHint )
-
class SVL_DLLPUBLIC SfxListener
{
struct Impl;
@@ -48,12 +45,12 @@ public:
void EndListeningAll();
bool IsListening( SfxBroadcaster& rBroadcaster ) const;
- sal_uInt16 GetBroadcasterCount() const;
- SfxBroadcaster* GetBroadcasterJOE( sal_uInt16 nNo ) const;
+ sal_uInt16 GetBroadcasterCount() const;
+ SfxBroadcaster* GetBroadcasterJOE( sal_uInt16 nNo ) const;
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- void RemoveBroadcaster_Impl( SfxBroadcaster& rBC );
+ void RemoveBroadcaster_Impl( SfxBroadcaster& rBC );
};
#endif
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 5531a4c..93dbf26 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -107,8 +107,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell,
public SfxListener
- 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;
bool WriteAsMathType3( SfxMedium& );
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index c05ea47..1f56595 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -123,8 +123,7 @@ private:
SymbolMap_t m_aSymbols;
bool m_bModified;
- 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:
SmSymbolManager();
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 460706e..b38a55f 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -117,8 +117,7 @@ void SmDocShell::InitInterface_Impl()
SFX_IMPL_OBJECTFACTORY(SmDocShell, SvGlobalName(SO3_SM_CLASSID),
SfxObjectShellFlags::STD_NORMAL, "smath" )
-void SmDocShell::SFX_NOTIFY(SfxBroadcaster&, const TypeId&,
- const SfxHint& rHint, const TypeId&)
+void SmDocShell::Notify(SfxBroadcaster&, const SfxHint& rHint)
{
switch (static_cast<const SfxSimpleHint&>(rHint).GetId())
{
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index 52d2a88..58ae786 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -106,8 +106,7 @@ bool SmSym::IsEqualInUI( const SmSym& rSymbol ) const
/**************************************************************************/
-void SmSymbolManager::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId&
rBCType,
- const SfxHint& /*rHint*/, const TypeId&
rHintType)
+void SmSymbolManager::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
{
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
