diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-27 16:57:21 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-09-06 15:47:44 -0500 |
| commit | 5bce32904091ffe28884fd5c0f4801ee82bad101 (patch) | |
| tree | fc2573078a858de456a0dc7b7810176d433241c7 /basic/source/classes | |
| parent | 10143717834d8401d85fdf9564e782a58b9983ec (diff) | |
SfxHint: convert home-grown RTTI to normal C++ RTTI
Also note that I fixed a bug in SvxFontMenuControl::Notify
where the if statement had the check the wrong way around.
Change-Id: I611e8929c65818191e36bd80f2b985820ada4411
Reviewed-on: https://gerrit.libreoffice.org/11147
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'basic/source/classes')
| -rw-r--r-- | basic/source/classes/sb.cxx | 2 | ||||
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 8 | ||||
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index db8487d21574..04303b3b2317 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -2100,7 +2100,7 @@ SbxVariable* BasicCollection::Find( const OUString& rName, SbxClassType t ) void BasicCollection::SFX_NOTIFY( SfxBroadcaster& rCst, const TypeId& rId1, const SfxHint& rHint, const TypeId& rId2 ) { - const SbxHint* p = PTR_CAST(SbxHint,&rHint); + const SbxHint* p = dynamic_cast<const SbxHint*>(&rHint); if( p ) { sal_uIntPtr nId = p->GetId(); diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 8a5e761ba47e..9a37a8480a40 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -2030,7 +2030,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, if( bNeedIntrospection ) doIntrospection(); - const SbxHint* pHint = PTR_CAST(SbxHint,&rHint); + const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint); if( pHint ) { SbxVariable* pVar = pHint->GetVar(); @@ -3617,7 +3617,7 @@ SbxVariable* SbUnoService::Find( const OUString& rName, SbxClassType ) void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) { - const SbxHint* pHint = PTR_CAST(SbxHint,&rHint); + const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint); if( pHint ) { SbxVariable* pVar = pHint->GetVar(); @@ -3838,7 +3838,7 @@ SbUnoSingleton::SbUnoSingleton( const OUString& aName_, void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) { - const SbxHint* pHint = PTR_CAST(SbxHint,&rHint); + const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint); if( pHint ) { SbxVariable* pVar = pHint->GetVar(); @@ -5012,7 +5012,7 @@ void SbUnoStructRefObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCTyp { if ( !mbMemberCacheInit ) initMemberCache(); - const SbxHint* pHint = PTR_CAST(SbxHint,&rHint); + const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint); if( pHint ) { SbxVariable* pVar = pHint->GetVar(); diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 6f1332fb668b..2ae87f32f3e8 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -747,7 +747,7 @@ void SbModule::SetParent( SbxObject* p ) void SbModule::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ) { - const SbxHint* pHint = PTR_CAST(SbxHint,&rHint); + const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint); if( pHint ) { SbxVariable* pVar = pHint->GetVar(); @@ -1892,7 +1892,7 @@ void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rH { bool bDone = false; - const SbxHint* pHint = PTR_CAST(SbxHint,&rHint); + const SbxHint* pHint = dynamic_cast<const SbxHint*>(&rHint); if( pHint ) { SbxVariable* pVar = pHint->GetVar(); |