From 07d85c44998f42545175ee77c192b901b52a30ca Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 24 Jun 2015 12:06:34 +0200 Subject: 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 --- basic/inc/sbobjmod.hxx | 3 +-- basic/inc/sbstdobj.hxx | 19 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'basic/inc') diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index cd673bfd71bd..364e8ccafe7f 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 40cd961400de..2bfd41936960 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 ); -- cgit