diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-06 22:51:07 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-06 22:51:42 +0200 |
| commit | db3b1dd86ed467889d595e080b00fc957eb155ff (patch) | |
| tree | 75a3d77e016aae6605e97d94f71a2d3918873b68 /sfx2 | |
| parent | 3ed4078ad2e1bb35829b118a5067ad3a43365bbc (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part3
Change-Id: Ibabd6d2d5e84fe007364bd1a4182a01ea2352b7a
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/sfxstatuslistener.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/control/statcach.cxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 1fa50a604733..aeaaebf51385 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -170,43 +170,43 @@ throw( RuntimeException, std::exception ) eState = SFX_ITEM_AVAILABLE; ::com::sun::star::uno::Type pType = rEvent.State.getValueType(); - if ( pType == ::getVoidCppuType() ) + if ( pType == ::cppu::UnoType< ::cppu::UnoVoidType >::get() ) { pItem = new SfxVoidItem( m_nSlotID ); eState = SFX_ITEM_UNKNOWN; } - else if ( pType == ::getBooleanCppuType() ) + else if ( pType == cppu::UnoType< bool >::get() ) { bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( m_nSlotID, bTemp ); } - else if ( pType == ::getCppuType((const sal_uInt16*)0) ) + else if ( pType == cppu::UnoType< ::cppu::UnoUnsignedShortType >::get() ) { sal_uInt16 nTemp = 0; rEvent.State >>= nTemp ; pItem = new SfxUInt16Item( m_nSlotID, nTemp ); } - else if ( pType == ::getCppuType((const sal_uInt32*)0) ) + else if ( pType == cppu::UnoType<sal_uInt32>::get() ) { sal_uInt32 nTemp = 0; rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( m_nSlotID, nTemp ); } - else if ( pType == ::getCppuType((const OUString*)0) ) + else if ( pType == cppu::UnoType<OUString>::get() ) { OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( m_nSlotID, sTemp ); } - else if ( pType == ::getCppuType((const ::com::sun::star::frame::status::ItemStatus*)0) ) + else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus >::get() ) { ItemStatus aItemStatus; rEvent.State >>= aItemStatus; eState = aItemStatus.State; pItem = new SfxVoidItem( m_nSlotID ); } - else if ( pType == ::getCppuType((const ::com::sun::star::frame::status::Visibility*)0) ) + else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility >::get() ) { Visibility aVisibilityStatus; rEvent.State >>= aVisibilityStatus; diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 6b5b5098de61..a21bfd88f75a 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -96,7 +96,7 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame:: ::com::sun::star::uno::Any aAny = aStatus.State; ::com::sun::star::uno::Type pType = aAny.getValueType(); - if ( pType == ::getBooleanCppuType() ) + if ( pType == cppu::UnoType< bool >::get() ) { bool bTemp = false; aAny >>= bTemp ; |