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 /connectivity/source/sdbcx | |
| parent | 87c1aa16a95dcff9247ae12a4bb5ea2d866b1772 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part19
Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9
Diffstat (limited to 'connectivity/source/sdbcx')
| -rw-r--r-- | connectivity/source/sdbcx/VCollection.cxx | 6 | ||||
| -rw-r--r-- | connectivity/source/sdbcx/VDescriptor.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/sdbcx/VTable.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 76d0692b8dc4..8081d15f42d3 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -256,7 +256,7 @@ OCollection::~OCollection() Any SAL_CALL OCollection::queryInterface( const Type & rType ) throw (RuntimeException, std::exception) { - if ( m_bUseIndexOnly && rType == ::getCppuType(static_cast< Reference< XNameAccess > *> (NULL)) ) + if ( m_bUseIndexOnly && rType == cppu::UnoType<XNameAccess>::get() ) { return Any(); } @@ -273,7 +273,7 @@ Sequence< Type > SAL_CALL OCollection::getTypes() throw (RuntimeException, std:: ::std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); - Type aType = ::getCppuType(static_cast< Reference<XNameAccess> *>(NULL)); + Type aType = cppu::UnoType<XNameAccess>::get(); for(;pBegin != pEnd; ++pBegin) { if ( *pBegin != aType ) @@ -480,7 +480,7 @@ void SAL_CALL OCollection::release() throw() Type SAL_CALL OCollection::getElementType( ) throw(RuntimeException, std::exception) { - return::getCppuType(static_cast< Reference< XPropertySet>*>(NULL)); + returncppu::UnoType<XPropertySet>::get(); } sal_Bool SAL_CALL OCollection::hasElements( ) throw(RuntimeException, std::exception) diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index a911b0b6f33c..8a1ff43cdfc7 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.cxx @@ -133,10 +133,10 @@ namespace connectivity Sequence< Type > SAL_CALL ODescriptor::getTypes( ) throw(RuntimeException, std::exception) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), - ::getCppuType( (const Reference< XFastPropertySet > *)0 ), - ::getCppuType( (const Reference< XPropertySet > *)0 ), - ::getCppuType( (const Reference< XUnoTunnel > *)0 )); + ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(), + cppu::UnoType<XFastPropertySet>::get(), + cppu::UnoType<XPropertySet>::get(), + cppu::UnoType<XUnoTunnel>::get()); return aTypes.getTypes(); } diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index e9cb3aeeb66c..42421f4cfcf1 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.cxx @@ -130,7 +130,7 @@ Any SAL_CALL OTable::queryInterface( const Type & rType ) throw(RuntimeException { if(!isNew()) aRet = OTable_BASE::queryInterface( rType); - if(isNew() && (rType == getCppuType( (Reference<XIndexesSupplier>*)0))) + if(isNew() && (rType == cppu::UnoType<XIndexesSupplier>::get())) return Any(); if(!aRet.hasValue()) aRet = OTableDescriptor_BASE::queryInterface( rType); |