diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-22 23:19:05 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-22 23:21:18 +0200 |
| commit | b09b5f8f7cfd2d7f3125dab93ebe996c160e1e0c (patch) | |
| tree | dacb87512726af1941d0c6b072d0b3626335cc4c /desktop | |
| parent | 87c1aa16a95dcff9247ae12a4bb5ea2d866b1772 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part19
Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_interact.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/dp_backend.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 3152817501e3..f61536868438 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -43,9 +43,7 @@ public: : m_type( type ), m_pselect( pselect ) { OSL_ASSERT( - ::getCppuType( - static_cast< Reference<task::XInteractionContinuation> - const *>(0) ).isAssignableFrom(m_type) ); } + cppu::UnoType<task::XInteractionContinuation>::get().isAssignableFrom(m_type) ); } // XInterface virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 076e4dd6bf71..fb5c05d2458d 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -582,8 +582,7 @@ void Package::exportTo( void Package::fireModified() { ::cppu::OInterfaceContainerHelper * container = rBHelper.getContainer( - ::getCppuType( static_cast<Reference< - util::XModifyListener> const *>(0) ) ); + cppu::UnoType<util::XModifyListener>::get() ); if (container != 0) { Sequence< Reference<XInterface> > elements( container->getElements() ); @@ -821,7 +820,7 @@ Any Package::TypeInfo::getIcon( sal_Bool /*highContrast*/, sal_Bool smallIcon ) if (! smallIcon) return Any(); const sal_uInt16 nIconId = m_smallIcon; - return Any( &nIconId, getCppuType( static_cast<sal_uInt16 const *>(0) ) ); + return Any( &nIconId, cppu::UnoType<cppu::UnoUnsignedShortType>::get() ); } } diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 6f2def52dea3..a852f23bfaac 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -1377,9 +1377,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem( catch (const Exception &) { const Any exc( ::cppu::getCaughtException() ); if (notifyDetectionError || - !exc.isExtractableTo( - ::getCppuType( reinterpret_cast< - lang::IllegalArgumentException const *>(0) ) )) + !exc.isExtractableTo( cppu::UnoType<lang::IllegalArgumentException>::get()) ) { interactContinuation( Any( lang::WrappedTargetException("bundle item error!", |