Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part19

Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9

55 files changed, 223 insertions, 223 deletions

diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 87bd7d331356..646d57865128 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -149,9 +149,9 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th
 
 Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 3b68dde5b8c8..33ea7a8eac72 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -231,7 +231,7 @@ void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, cons
     // find the end of the current chain
     Any* pChainIterator = &m_aContent;
     SQLException* pLastException = NULL;
-    const Type& aSQLExceptionType( ::getCppuType< SQLException >() );
+    const Type& aSQLExceptionType( cppu::UnoType<SQLException>::get() );
     while ( pChainIterator )
     {
         if ( !pChainIterator->hasValue() )
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 60c3ef8ef0e5..70c9564e2811 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -119,11 +119,11 @@ namespace param
     Sequence< Type > SAL_CALL ParameterWrapper::getTypes(   ) throw(RuntimeException, std::exception)
     {
         Sequence< Type > aTypes( 5 );
-        aTypes[ 0 ] = ::getCppuType( static_cast< Reference< XWeak >*             >( NULL ) );
-        aTypes[ 1 ] = ::getCppuType( static_cast< Reference< XTypeProvider >* >( NULL ) );
-        aTypes[ 2 ] = ::getCppuType( static_cast< Reference< XPropertySet >*      >( NULL ) );
-        aTypes[ 3 ] = ::getCppuType( static_cast< Reference< XFastPropertySet >*  >( NULL ) );
-        aTypes[ 4 ] = ::getCppuType( static_cast< Reference< XMultiPropertySet >* >( NULL ) );
+        aTypes[ 0 ] = cppu::UnoType<XWeak>::get();
+        aTypes[ 1 ] = cppu::UnoType<XTypeProvider>::get();
+        aTypes[ 2 ] = cppu::UnoType<XPropertySet>::get();
+        aTypes[ 3 ] = cppu::UnoType<XFastPropertySet>::get();
+        aTypes[ 4 ] = cppu::UnoType<XMultiPropertySet>::get();
         return aTypes;
     }
 
@@ -295,7 +295,7 @@ namespace param
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         impl_checkDisposed_throw();
-        return ::getCppuType( static_cast< Reference< XPropertySet >* >( NULL ) );
+        return cppu::UnoType<XPropertySet>::get();
     }
 
 
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index d7113048ece9..266000b5db58 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -101,9 +101,9 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 31ed7ac31cc4..03f49802f326 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -104,10 +104,10 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedBatchExecution > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
+                                    cppu::UnoType<XParameters>::get(),
+                                    cppu::UnoType<XResultSetMetaDataSupplier>::get(),
+                                    cppu::UnoType<XPreparedBatchExecution>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_Base::getTypes());
 }
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index f5db7bf2f307..4a5dd491dfe6 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -139,9 +139,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OResultSet::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 03e06a0a0b93..9351a2f4fa32 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -122,9 +122,9 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OStatement_Base::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 02e6fa268a59..78ad0d07ae95 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -734,22 +734,22 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const
             break;
         }
         case VT_I1:
-            aValue.setValue( & cVal, getCppuType((sal_Int8*)0));
+            aValue.setValue( & cVal, cppu::UnoType<sal_Int8>::get());
             break;
         case VT_UI1: // there is no unsigned char in UNO
-            aValue.setValue( & bVal, getCppuType( (sal_Int8*)0));
+            aValue.setValue( & bVal, cppu::UnoType<sal_Int8>::get());
             break;
         case VT_UI2:
-            aValue.setValue( & uiVal, getCppuType( (sal_uInt16*)0));
+            aValue.setValue( & uiVal, cppu::UnoType<cppu::UnoUnsignedShortType>::get());
             break;
         case VT_UI4:
-            aValue.setValue( & ulVal, getCppuType( (sal_uInt32*)0));
+            aValue.setValue( & ulVal, cppu::UnoType<sal_uInt32>::get());
             break;
         case VT_INT:
             aValue.setValue( & intVal, cppu::UnoType<sal_Int32>::get());
             break;
         case VT_UINT:
-            aValue.setValue( & uintVal, getCppuType( (sal_uInt32*)0));
+            aValue.setValue( & uintVal, cppu::UnoType<sal_uInt32>::get());
             break;
         case VT_VOID:
             aValue.setValue( NULL, Type());
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 7910c1031ed4..87ee744f52f9 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -659,14 +659,14 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes(  ) throw(RuntimeException, std::
     const Type* pEnd = pBegin + aTypes.getLength();
     for(;pBegin != pEnd;++pBegin)
     {
-        if(!(   *pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
-                *pBegin == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
-                *pBegin == ::getCppuType((const Reference<XRename>*)0) ||
-                *pBegin == ::getCppuType((const Reference<XAlterTable>*)0) ||
-                *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)))
+        if(!(   *pBegin == cppu::UnoType<XKeysSupplier>::get()||
+                *pBegin == cppu::UnoType<XIndexesSupplier>::get()||
+                *pBegin == cppu::UnoType<XRename>::get()||
+                *pBegin == cppu::UnoType<XAlterTable>::get()||
+                *pBegin == cppu::UnoType<XDataDescriptorFactory>::get()))
             aOwnTypes.push_back(*pBegin);
     }
-    aOwnTypes.push_back(::getCppuType( (const Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ));
+    aOwnTypes.push_back(cppu::UnoType<com::sun::star::lang::XUnoTunnel>::get());
 
     const Type* pAttrs = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
     return Sequence< Type >(pAttrs, aOwnTypes.size());
@@ -675,11 +675,11 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes(  ) throw(RuntimeException, std::
 
 Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
-        rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
-        rType == ::getCppuType((const Reference<XRename>*)0) ||
-        rType == ::getCppuType((const Reference<XAlterTable>*)0) ||
-        rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
+    if( rType == cppu::UnoType<XKeysSupplier>::get()||
+        rType == cppu::UnoType<XIndexesSupplier>::get()||
+        rType == cppu::UnoType<XRename>::get()||
+        rType == cppu::UnoType<XAlterTable>::get()||
+        rType == cppu::UnoType<XDataDescriptorFactory>::get())
         return Any();
 
     const Any aRet = ::cppu::queryInterface(rType,static_cast< ::com::sun::star::lang::XUnoTunnel*> (this));
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 9dd02ba42865..ef07b2689dc1 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -718,13 +718,13 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes(  ) throw(RuntimeException, std:
     const Type* pEnd = pBegin + aTypes.getLength();
     for(;pBegin != pEnd;++pBegin)
     {
-        if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0)   ||
-            *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)))
+        if(!(*pBegin == cppu::UnoType<XKeysSupplier>::get()||
+            *pBegin == cppu::UnoType<XDataDescriptorFactory>::get()))
         {
             aOwnTypes.push_back(*pBegin);
         }
     }
-    aOwnTypes.push_back(::getCppuType( (const Reference< ::com::sun::star::lang::XUnoTunnel > *)0 ));
+    aOwnTypes.push_back(cppu::UnoType<com::sun::star::lang::XUnoTunnel>::get());
     Type *pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
     return Sequence< Type >(pTypes, aOwnTypes.size());
 }
@@ -732,8 +732,8 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes(  ) throw(RuntimeException, std:
 
 Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0)  ||
-        rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
+    if( rType == cppu::UnoType<XKeysSupplier>::get()||
+        rType == cppu::UnoType<XDataDescriptorFactory>::get())
         return Any();
 
     Any aRet = OTable_TYPEDEF::queryInterface(rType);
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 7c3458b3d2c2..a0b2ccf48795 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -125,9 +125,9 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
 
 Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                    cppu::UnoType<XFastPropertySet>::get(),
+                                    cppu::UnoType<XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBase::getTypes());
 }
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 2026f4244d78..079f53b84fc6 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -68,9 +68,9 @@ void OFileCatalog::refreshTables()
 
 Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) ||
-        rType == ::getCppuType((const Reference<XUsersSupplier>*)0) ||
-        rType == ::getCppuType((const Reference<XViewsSupplier>*)0))
+    if( rType == cppu::UnoType<XGroupsSupplier>::get()||
+        rType == cppu::UnoType<XUsersSupplier>::get()||
+        rType == cppu::UnoType<XViewsSupplier>::get())
         return Any();
 
 
@@ -89,9 +89,9 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes(  ) throw(RuntimeException, std
     const Type* pEnd = pBegin + aTypes.getLength();
     for(;pBegin != pEnd;++pBegin)
     {
-        if(!(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0) ||
-            *pBegin == ::getCppuType((const Reference<XUsersSupplier>*)0)   ||
-            *pBegin == ::getCppuType((const Reference<XViewsSupplier>*)0)))
+        if(!(*pBegin == cppu::UnoType<XGroupsSupplier>::get()||
+            *pBegin == cppu::UnoType<XUsersSupplier>::get()||
+            *pBegin == cppu::UnoType<XViewsSupplier>::get()))
         {
             aOwnTypes.push_back(*pBegin);
         }
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 6fb706bde90a..89bab271c50c 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -121,9 +121,9 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-        ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ),
-                                        ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ),
-                                        ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ));
+        ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
+                                        cppu::UnoType<XParameters>::get(),
+                                        cppu::UnoType<XResultSetMetaDataSupplier>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes());
 }
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index aece696e95b8..4f454e3fd6aa 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -179,9 +179,9 @@ Sequence< Type > SAL_CALL OResultSet::getTypes(  ) throw(RuntimeException, std::
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                            ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ),
-                            ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                            cppu::UnoType<com::sun::star::beans::XPropertySet>::get(),
+                            cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
@@ -1154,7 +1154,7 @@ void OResultSet::sortRows()
         // is just one field given for sorting
         // and this field is indexed, then the Index will be used
         Reference<XIndexesSupplier> xIndexSup;
-        m_pTable->queryInterface(::getCppuType((const Reference<XIndexesSupplier>*)0)) >>= xIndexSup;
+        m_pTable->queryInterface(cppu::UnoType<XIndexesSupplier>::get()) >>= xIndexSup;
 
         Reference<XIndexAccess> xIndexes;
         if(xIndexSup.is())
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index a95af1c609f4..031b81f4c7ae 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -151,9 +151,9 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
 
 Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                                                    ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                                                    ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                                                    cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                                                    cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 70e7c2d2dd64..4abbcbdf4dca 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -107,11 +107,11 @@ void OFileTable::refreshIndexes()
 
 Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
-        rType == ::getCppuType((const Reference<XRename>*)0) ||
-        rType == ::getCppuType((const Reference<XAlterTable>*)0) ||
-        rType == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
-        rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
+    if( rType == cppu::UnoType<XKeysSupplier>::get()||
+        rType == cppu::UnoType<XRename>::get()||
+        rType == cppu::UnoType<XAlterTable>::get()||
+        rType == cppu::UnoType<XIndexesSupplier>::get()||
+        rType == cppu::UnoType<XDataDescriptorFactory>::get())
         return Any();
 
     return OTable_TYPEDEF::queryInterface(rType);
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index acff3d59142b..ae5f2cb7cf87 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -53,10 +53,10 @@ m_xMetaData.clear();
 
 Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if( rType == ::getCppuType((const Reference<XColumnLocate>*)0) ||
-        rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0) ||
-        rType == ::getCppuType((const Reference<XAppend>*)0) ||
-        rType == ::getCppuType((const Reference<XDrop>*)0))
+    if( rType == cppu::UnoType<XColumnLocate>::get()||
+        rType == cppu::UnoType<XDataDescriptorFactory>::get()||
+        rType == cppu::UnoType<XAppend>::get()||
+        rType == cppu::UnoType<XDrop>::get())
         return Any();
 
     typedef sdbcx::OCollection OTables_BASE;
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 3d743a93af92..a9a8bc54130e 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -64,8 +64,8 @@ sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName
 
 Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if(rType == ::getCppuType((const Reference<XDeleteRows>*)0) || rType == ::getCppuType((const Reference<XResultSetUpdate>*)0)
-        || rType == ::getCppuType((const Reference<XRowUpdate>*)0))
+    if(rType == cppu::UnoType<XDeleteRows>::get()|| rType == cppu::UnoType<XResultSetUpdate>::get()
+        || rType == cppu::UnoType<XRowUpdate>::get())
         return Any();
 
     const Any aRet = OResultSet::queryInterface(rType);
@@ -81,9 +81,9 @@ Sequence<  Type > SAL_CALL OFlatResultSet::getTypes(  ) throw( RuntimeException,
     const Type* pEnd = pBegin + aTypes.getLength();
     for(;pBegin != pEnd;++pBegin)
     {
-        if(!(*pBegin == ::getCppuType((const Reference<XDeleteRows>*)0) ||
-            *pBegin == ::getCppuType((const Reference<XResultSetUpdate>*)0) ||
-            *pBegin == ::getCppuType((const Reference<XRowUpdate>*)0)))
+        if(!(*pBegin == cppu::UnoType<XDeleteRows>::get()||
+            *pBegin == cppu::UnoType<XResultSetUpdate>::get()||
+            *pBegin == cppu::UnoType<XRowUpdate>::get()))
         {
             aOwnTypes.push_back(*pBegin);
         }
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 2b4a75f47365..7059cb2d18a8 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -543,11 +543,11 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes(  ) throw(RuntimeException, std::
     const Type* pEnd = pBegin + aTypes.getLength();
     for(;pBegin != pEnd;++pBegin)
     {
-        if(!(*pBegin == ::getCppuType((const Reference<XKeysSupplier>*)0)   ||
-            *pBegin == ::getCppuType((const Reference<XRename>*)0)          ||
-            *pBegin == ::getCppuType((const Reference<XIndexesSupplier>*)0) ||
-            *pBegin == ::getCppuType((const Reference<XAlterTable>*)0)      ||
-            *pBegin == ::getCppuType((const Reference<XDataDescriptorFactory>*)0)))
+        if(!(*pBegin == cppu::UnoType<XKeysSupplier>::get()||
+            *pBegin == cppu::UnoType<XRename>::get()||
+            *pBegin == cppu::UnoType<XIndexesSupplier>::get()||
+            *pBegin == cppu::UnoType<XAlterTable>::get()||
+            *pBegin == cppu::UnoType<XDataDescriptorFactory>::get()))
         {
             aOwnTypes.push_back(*pBegin);
         }
@@ -559,11 +559,11 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes(  ) throw(RuntimeException, std::
 
 Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0)      ||
-        rType == ::getCppuType((const Reference<XIndexesSupplier>*)0)   ||
-        rType == ::getCppuType((const Reference<XRename>*)0)            ||
-        rType == ::getCppuType((const Reference<XAlterTable>*)0)        ||
-        rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
+    if( rType == cppu::UnoType<XKeysSupplier>::get()||
+        rType == cppu::UnoType<XIndexesSupplier>::get()||
+        rType == cppu::UnoType<XRename>::get()||
+        rType == cppu::UnoType<XAlterTable>::get()||
+        rType == cppu::UnoType<XDataDescriptorFactory>::get())
         return Any();
 
     Any aRet = OTable_TYPEDEF::queryInterface(rType);
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 25529f81c36b..9a87f6e0bdae 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -127,7 +127,7 @@ void OHCatalog::refreshUsers()
 
 Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if ( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) )
+    if ( rType == cppu::UnoType<XGroupsSupplier>::get())
         return Any();
 
     return OCatalog::queryInterface(rType);
@@ -142,7 +142,7 @@ Sequence< Type > SAL_CALL OHCatalog::getTypes(  ) throw(RuntimeException, std::e
     const Type* pEnd = pBegin + aTypes.getLength();
     for(;pBegin != pEnd;++pBegin)
     {
-        if ( !(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0)))
+        if ( !(*pBegin == cppu::UnoType<XGroupsSupplier>::get()))
         {
             aOwnTypes.push_back(*pBegin);
         }
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 6ee8f5bf77a4..4e7b9654a84d 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -351,7 +351,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes(  ) throw(RuntimeException, std::
         const Type* pEnd = pIter + aTypes.getLength();
         for(;pIter != pEnd;++pIter)
         {
-            if( *pIter != ::getCppuType((const Reference<XRename>*)0) )
+            if( *pIter != cppu::UnoType<XRename>::get())
             {
                 aOwnTypes.push_back(*pIter);
             }
@@ -401,7 +401,7 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException,
 
 Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if( m_Type.equalsAscii("VIEW") && rType == ::getCppuType((const Reference<XRename>*)0) )
+    if( m_Type.equalsAscii("VIEW") && rType == cppu::UnoType<XRename>::get())
         return Any();
 
     return OTableHelper::queryInterface(rType);
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index a39bab042593..bb16548c2e70 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -61,8 +61,8 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) th
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XRow > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XOutParameters > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<starsdbc::XRow>::get(),
+                                    cppu::UnoType<starsdbc::XOutParameters>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes());
 }
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 060ae0f251e3..7154cd9b0252 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -121,7 +121,7 @@ void SAL_CALL OStatement_BASE2::release() throw()
 
 Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) )
+    if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType<XGeneratedResultSet>::get())
         return Any();
     Any aRet( java_sql_Statement_BASE::queryInterface(rType) );
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
@@ -129,15 +129,15 @@ Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw
 
 Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                                ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                                ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                                cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                                cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     Sequence< Type > aOldTypes = java_sql_Statement_BASE::getTypes();
     if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() )
     {
         ::std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(),
-                        ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ));
+                        cppu::UnoType<XGeneratedResultSet>::get());
         aOldTypes.realloc(aOldTypes.getLength() - 1);
     }
 
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index d9e97d52a003..2ebd437c2752 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -82,10 +82,10 @@ jclass java_sql_PreparedStatement::getMyClass() const
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< XResultSetMetaDataSupplier > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedBatchExecution > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XPreparedStatement>::get(),
+                                    cppu::UnoType<XParameters>::get(),
+                                    cppu::UnoType<XResultSetMetaDataSupplier>::get(),
+                                    cppu::UnoType<XPreparedBatchExecution>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes());
 }
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index b247671fe587..6d327c1db7ec 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -122,9 +122,9 @@ m_xMetaData.clear();
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_ResultSet::getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                    cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_ResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index d13e3dcddd06..ad7f98cb93e2 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -137,9 +137,9 @@ void SAL_CALL KabResultSet::release() throw()
 Sequence<  Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std::exception)
 {
     OTypeCollection aTypes(
-        ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet >*) 0),
-        ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet >*) 0),
-        ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet >*) 0));
+        cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+        cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+        cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return comphelper::concatSequences(aTypes.getTypes(), KabResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 5bf7d8e6a427..65dcb06d1b45 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -362,9 +362,9 @@ Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(Runt
 
 Sequence< Type > SAL_CALL KabCommonStatement::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                    cppu::UnoType<XFastPropertySet>::get(),
+                                    cppu::UnoType<XPropertySet>::get());
 
     return comphelper::concatSequences(aTypes.getTypes(),KabCommonStatement_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index d0206dfcbe23..0e3aee4c47cc 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -163,9 +163,9 @@ void SAL_CALL MacabResultSet::release() throw()
 Sequence<  Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException)
 {
     OTypeCollection aTypes(
-        ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet >*) 0),
-        ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet >*) 0),
-        ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet >*) 0));
+        cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+        cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+        cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return comphelper::concatSequences(aTypes.getTypes(), MacabResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 87b279933323..0fb2105a69c9 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -372,9 +372,9 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(Ru
 
 Sequence< Type > SAL_CALL MacabCommonStatement::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                    cppu::UnoType<XFastPropertySet>::get(),
+                                    cppu::UnoType<XPropertySet>::get());
 
     return comphelper::concatSequences(aTypes.getTypes(),MacabCommonStatement_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index c85e8426b41c..0473655469a0 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -146,9 +146,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
  Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException, std::exception)
 {
-    OTypeCollection aTypes( ::getCppuType( (const  Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                                ::getCppuType( (const  Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                                ::getCppuType( (const  Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                                cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                                cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index c9a06ffe70ac..20a30112998e 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -121,9 +121,9 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
 
 Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                    cppu::UnoType<XFastPropertySet>::get(),
+                                    cppu::UnoType<XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes());
 }
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index a0d78de6bb11..519a1b1d69e3 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -144,9 +144,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
  Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException)
 {
-    OTypeCollection aTypes( ::getCppuType( (const  Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                                ::getCppuType( (const  Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                                ::getCppuType( (const  Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                                cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                                cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 56637f141c7a..84068200f777 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -116,9 +116,9 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
 
 Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                    cppu::UnoType<XFastPropertySet>::get(),
+                                    cppu::UnoType<XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes());
 }
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 5510faec0050..85adabef944c 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -119,7 +119,7 @@ void OMySQLCatalog::refreshUsers()
 
 Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if ( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) )
+    if ( rType == cppu::UnoType<XGroupsSupplier>::get())
         return Any();
 
 
@@ -135,7 +135,7 @@ Sequence< Type > SAL_CALL OMySQLCatalog::getTypes(  ) throw(RuntimeException, st
     const Type* pEnd = pBegin + aTypes.getLength();
     for(;pBegin != pEnd;++pBegin)
     {
-        if ( !(*pBegin == ::getCppuType((const Reference<XGroupsSupplier>*)0)))
+        if ( !(*pBegin == cppu::UnoType<XGroupsSupplier>::get()))
         {
             aOwnTypes.push_back(*pBegin);
         }
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 46ef1809b87a..7a2d3dc947d4 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -125,9 +125,9 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
 
 Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                    cppu::UnoType<XFastPropertySet>::get(),
+                                    cppu::UnoType<XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 76e53b9d8f26..f5a79b0d283f 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -362,9 +362,9 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
  Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException, std::exception)
 {
-    OTypeCollection aTypes( ::getCppuType( (const  Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
-                                                ::getCppuType( (const  Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ),
-                                                ::getCppuType( (const  Reference< ::com::sun::star::beans::XPropertySet > *)0 ));
+    OTypeCollection aTypes( cppu::UnoType<com::sun::star::beans::XMultiPropertySet>::get(),
+                                                cppu::UnoType<com::sun::star::beans::XFastPropertySet>::get(),
+                                                cppu::UnoType<com::sun::star::beans::XPropertySet>::get());
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index 40466b8301c8..c9391e84ecfb 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -131,7 +131,7 @@ void SAL_CALL OStatement_BASE2::release() throw()
 
 Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception)
 {
-    if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) )
+    if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType<XGeneratedResultSet>::get())
         return Any();
     Any aRet = OStatement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
@@ -139,14 +139,14 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
 
 Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException, std::exception)
 {
-    ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
-                                    ::getCppuType( (const Reference< XPropertySet > *)0 ));
+    ::cppu::OTypeCollection aTypes( cppu::UnoType<XMultiPropertySet>::get(),
+                                    cppu::UnoType<XFastPropertySet>::get(),
+                                    cppu::UnoType<XPropertySet>::get());
     Sequence< Type > aOldTypes = OStatement_BASE::getTypes();
     if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() )
     {
         ::std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(),
-                        ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ));
+                        cppu::UnoType<XGeneratedResultSet>::get());
         aOldTypes.realloc(aOldTypes.getLength() - 1);
     }
 
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index a8af6d40eb74..55a670291f77 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -202,14 +202,14 @@ Sequence<Type > BaseResultSet::getTypes() throw( RuntimeException, std::exceptio
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< XResultSet> *) 0 ),
-                getCppuType( (Reference< XResultSetMetaDataSupplier> *) 0 ),
-                getCppuType( (Reference< XRow> *) 0 ),
-                getCppuType( (Reference< XColumnLocate> *) 0 ),
-                getCppuType( (Reference< XCloseable> *) 0 ),
-                getCppuType( (Reference< XPropertySet >*) 0 ),
-                getCppuType( (Reference< XFastPropertySet > *) 0 ),
-                getCppuType( (Reference< XMultiPropertySet > *) 0 ),
+                cppu::UnoType<XResultSet>::get(),
+                cppu::UnoType<XResultSetMetaDataSupplier>::get(),
+                cppu::UnoType<XRow>::get(),
+                cppu::UnoType<XColumnLocate>::get(),
+                cppu::UnoType<XCloseable>::get(),
+                cppu::UnoType<XPropertySet>::get(),
+                cppu::UnoType<XFastPropertySet>::get(),
+                cppu::UnoType<XMultiPropertySet>::get(),
                 OComponentHelper::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
index b37c3b2e03fd..78a67428baf9 100644
--- a/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx
@@ -96,8 +96,8 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Type > FakedUpdateableResult
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< XResultSetUpdate> *) 0 ),
-                getCppuType( (Reference< XRowUpdate> *) 0 ),
+                cppu::UnoType<XResultSetUpdate>::get(),
+                cppu::UnoType<XRowUpdate>::get(),
                 ResultSet::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 55c0175e48fa..dcaa620eaa8f 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -269,15 +269,15 @@ Sequence< Type > PreparedStatement::getTypes() throw ( RuntimeException, std::ex
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< XWarningsSupplier> *) 0 ),
-                getCppuType( (Reference< XPreparedStatement> *) 0 ),
-                getCppuType( (Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier> *) 0 ),
-                getCppuType( (Reference< XParameters> *) 0 ),
-                getCppuType( (Reference< XCloseable> *) 0 ),
-                getCppuType( (Reference< XGeneratedResultSet> *) 0 ),
-                getCppuType( (Reference< XPropertySet >*) 0 ),
-                getCppuType( (Reference< XFastPropertySet > *) 0 ),
-                getCppuType( (Reference< XMultiPropertySet > *) 0 ),
+                cppu::UnoType<XWarningsSupplier>::get(),
+                cppu::UnoType<XPreparedStatement>::get(),
+                cppu::UnoType<com::sun::star::sdbc::XResultSetMetaDataSupplier>::get(),
+                cppu::UnoType<XParameters>::get(),
+                cppu::UnoType<XCloseable>::get(),
+                cppu::UnoType<XGeneratedResultSet>::get(),
+                cppu::UnoType<XPropertySet>::get(),
+                cppu::UnoType<XFastPropertySet>::get(),
+                cppu::UnoType<XMultiPropertySet>::get(),
                 OComponentHelper::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 23727dbf126a..629d362866b9 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -215,14 +215,14 @@ Sequence< Type > Statement::getTypes() throw ( RuntimeException, std::exception
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< XWarningsSupplier> *) 0 ),
-                getCppuType( (Reference< XStatement> *) 0 ),
-                getCppuType( (Reference< com::sun::star::sdbc::XResultSetMetaDataSupplier> *) 0 ),
-                getCppuType( (Reference< XCloseable> *) 0 ),
-                getCppuType( (Reference< XPropertySet >*) 0 ),
-                getCppuType( (Reference< XFastPropertySet > *) 0 ),
-                getCppuType( (Reference< XMultiPropertySet > *) 0 ),
-                getCppuType( (Reference< XGeneratedResultSet > *) 0 ),
+                cppu::UnoType<XWarningsSupplier>::get(),
+                cppu::UnoType<XStatement>::get(),
+                cppu::UnoType<com::sun::star::sdbc::XResultSetMetaDataSupplier>::get(),
+                cppu::UnoType<XCloseable>::get(),
+                cppu::UnoType<XPropertySet>::get(),
+                cppu::UnoType<XFastPropertySet>::get(),
+                cppu::UnoType<XMultiPropertySet>::get(),
+                cppu::UnoType<XGeneratedResultSet>::get(),
                 OComponentHelper::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index ff89568e214e..17428fd96fe2 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -1209,11 +1209,11 @@ bool implSetObject(	const Reference< XParameters >& _rxParameters,
                 bSuccessfullyReRouted = false;
             break;
         case typelib_TypeClass_STRUCT:
-            if (_rValue.getValueType() == ::getCppuType((const com::sun::star::util::DateTime*)0))
+            if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::DateTime>::get())
                 _rxParameters->setTimestamp(_nColumnIndex, *(com::sun::star::util::DateTime*)_rValue.getValue());
-            else if (_rValue.getValueType() == ::getCppuType((const com::sun::star::util::Date*)0))
+            else if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::Date>::get())
                 _rxParameters->setDate(_nColumnIndex, *(com::sun::star::util::Date*)_rValue.getValue());
-            else if (_rValue.getValueType() == ::getCppuType((const com::sun::star::util::Time*)0))
+            else if (_rValue.getValueType() == cppu::UnoType<com::sun::star::util::Time>::get())
                 _rxParameters->setTime(_nColumnIndex, *(com::sun::star::util::Time*)_rValue.getValue());
             else
                 bSuccessfullyReRouted = false;
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index ac7b755faf90..dfe3f42c0e9b 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -157,8 +157,8 @@ com::sun::star::uno::Sequence< com::sun::star::uno::Type > UpdateableResultSet::
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< XResultSetUpdate> *) 0 ),
-                getCppuType( (Reference< XRowUpdate> *) 0 ),
+                cppu::UnoType<XResultSetUpdate>::get(),
+                cppu::UnoType<XRowUpdate>::get(),
                 SequenceResultSet::getTypes());
             pCollection = &collection;
         }
@@ -549,27 +549,27 @@ Sequence< Type > UpdateableResultSet::getStaticTypes( bool updateable )
     if( updateable )
     {
         cppu::OTypeCollection collection(
-            getCppuType( (Reference< XResultSetUpdate> *) 0 ),
-            getCppuType( (Reference< XRowUpdate> *) 0 ),
-//             getCppuType( (Reference< com::sun::star::sdbcx::XRowLocate > *) 0 ),
+            cppu::UnoType<XResultSetUpdate>::get(),
+            cppu::UnoType<XRowUpdate>::get(),
+//             cppu::UnoType<com::sun::star::sdbcx::XRowLocate>::get(),
             getStaticTypes( false /* updateable */ ) );
         return collection.getTypes();
     }
     else
     {
         cppu::OTypeCollection collection(
-            getCppuType( (Reference< XResultSet> *) 0 ),
-            getCppuType( (Reference< XResultSetMetaDataSupplier> *) 0 ),
-            getCppuType( (Reference< XRow> *) 0 ),
-            getCppuType( (Reference< XColumnLocate> *) 0 ),
-            getCppuType( (Reference< XCloseable> *) 0 ),
-            getCppuType( (Reference< XPropertySet >*) 0 ),
-            getCppuType( (Reference< XFastPropertySet > *) 0 ),
-            getCppuType( (Reference< XMultiPropertySet > *) 0 ),
-            getCppuType( (const Reference< com::sun::star::lang::XComponent > *)0 ),  // OComponentHelper
-            getCppuType( (const Reference< com::sun::star::lang::XTypeProvider > *)0 ),
-            getCppuType( (const Reference< com::sun::star::uno::XAggregation > *)0 ),
-            getCppuType( (const Reference< com::sun::star::uno::XWeak > *)0 ) );
+            cppu::UnoType<XResultSet>::get(),
+            cppu::UnoType<XResultSetMetaDataSupplier>::get(),
+            cppu::UnoType<XRow>::get(),
+            cppu::UnoType<XColumnLocate>::get(),
+            cppu::UnoType<XCloseable>::get(),
+            cppu::UnoType<XPropertySet>::get(),
+            cppu::UnoType<XFastPropertySet>::get(),
+            cppu::UnoType<XMultiPropertySet>::get(),
+            cppu::UnoType<com::sun::star::lang::XComponent>::get(),  // OComponentHelper
+            cppu::UnoType<com::sun::star::lang::XTypeProvider>::get(),
+            cppu::UnoType<com::sun::star::uno::XAggregation>::get(),
+            cppu::UnoType<com::sun::star::uno::XWeak>::get());
         return collection.getTypes();
     }
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx
index 02cd0fc97dfd..3539abe8abf3 100644
--- a/connectivity/source/drivers/postgresql/pq_xbase.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx
@@ -164,12 +164,12 @@ Sequence< com::sun::star::uno::Type > ReflectionBase::getTypes()
 {
     osl::MutexGuard guard( m_refMutex->mutex );
     static cppu::OTypeCollection collection(
-        getCppuType( (Reference< XPropertySet >*) 0 ),
-        getCppuType( (Reference< XFastPropertySet > *) 0 ),
-        getCppuType( (Reference< XMultiPropertySet > *) 0 ),
-        getCppuType( (Reference< com::sun::star::lang::XServiceInfo > *) 0 ),
-        getCppuType( (Reference< com::sun::star::sdbcx::XDataDescriptorFactory > *) 0 ),
-        getCppuType( (Reference< com::sun::star::container::XNamed > *) 0 ),
+        cppu::UnoType<XPropertySet>::get(),
+        cppu::UnoType<XFastPropertySet>::get(),
+        cppu::UnoType<XMultiPropertySet>::get(),
+        cppu::UnoType<com::sun::star::lang::XServiceInfo>::get(),
+        cppu::UnoType<com::sun::star::sdbcx::XDataDescriptorFactory>::get(),
+        cppu::UnoType<com::sun::star::container::XNamed>::get(),
         OComponentHelper::getTypes());
     return collection.getTypes();
 }
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index b4ae905bab0f..2af77d5004a2 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -98,7 +98,7 @@ public:
     }
     virtual Type getType() const SAL_OVERRIDE
     {
-        return getCppuType( (Reference< XContainerListener > *)0 );
+        return cppu::UnoType<XContainerListener>::get();
     }
 };
 
@@ -120,7 +120,7 @@ public:
 
     virtual Type getType() const SAL_OVERRIDE
     {
-        return getCppuType( (Reference< XContainerListener > *)0 );
+        return cppu::UnoType<XContainerListener>::get();
     }
 };
 
@@ -141,7 +141,7 @@ public:
 
     virtual Type getType() const SAL_OVERRIDE
     {
-        return getCppuType( (Reference< XContainerListener > *)0 );
+        return cppu::UnoType<XContainerListener>::get();
     }
 };
 
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index 9c81b6ce47f5..6ce1c9c2099a 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx
@@ -134,7 +134,7 @@ Sequence<Type > Index::getTypes() throw( RuntimeException, std::exception )
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+                cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
                 ReflectionBase::getTypes());
             pCollection = &collection;
         }
@@ -207,7 +207,7 @@ Sequence<Type > IndexDescriptor::getTypes() throw( RuntimeException, std::except
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+                cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
                 ReflectionBase::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index 7aacf2a72fcd..e47a0434706e 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx
@@ -136,7 +136,7 @@ Sequence<Type > Key::getTypes() throw( RuntimeException, std::exception )
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+                cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
                 ReflectionBase::getTypes());
             pCollection = &collection;
         }
@@ -204,7 +204,7 @@ Sequence<Type > KeyDescriptor::getTypes() throw( RuntimeException, std::exceptio
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+                cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
                 ReflectionBase::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index e6e1363c8117..f907597c12c4 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -291,11 +291,11 @@ Sequence<Type > Table::getTypes() throw( RuntimeException, std::exception )
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< com::sun::star::sdbcx::XIndexesSupplier> *) 0 ),
-                getCppuType( (Reference< com::sun::star::sdbcx::XKeysSupplier> *) 0 ),
-                getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
-                getCppuType( (Reference< com::sun::star::sdbcx::XRename> *) 0 ),
-                getCppuType( (Reference< com::sun::star::sdbcx::XAlterTable> *) 0 ),
+                cppu::UnoType<com::sun::star::sdbcx::XIndexesSupplier>::get(),
+                cppu::UnoType<com::sun::star::sdbcx::XKeysSupplier>::get(),
+                cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
+                cppu::UnoType<com::sun::star::sdbcx::XRename>::get(),
+                cppu::UnoType<com::sun::star::sdbcx::XAlterTable>::get(),
                 ReflectionBase::getTypes());
             pCollection = &collection;
         }
@@ -405,9 +405,9 @@ Sequence<Type > TableDescriptor::getTypes() throw( RuntimeException, std::except
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< com::sun::star::sdbcx::XIndexesSupplier> *) 0 ),
-                getCppuType( (Reference< com::sun::star::sdbcx::XKeysSupplier> *) 0 ),
-                getCppuType( (Reference< com::sun::star::sdbcx::XColumnsSupplier> *) 0 ),
+                cppu::UnoType<com::sun::star::sdbcx::XIndexesSupplier>::get(),
+                cppu::UnoType<com::sun::star::sdbcx::XKeysSupplier>::get(),
+                cppu::UnoType<com::sun::star::sdbcx::XColumnsSupplier>::get(),
                 ReflectionBase::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index 1ebf29df7d05..63875eb9c2c9 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -115,7 +115,7 @@ Sequence<Type > User::getTypes() throw( RuntimeException, std::exception )
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< com::sun::star::sdbcx::XUser> *) 0 ),
+                cppu::UnoType<com::sun::star::sdbcx::XUser>::get(),
                 ReflectionBase::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index ca2202f6e8f0..e2e0aaf10845 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -187,7 +187,7 @@ Sequence<Type > View::getTypes() throw( RuntimeException, std::exception )
         if( !pCollection )
         {
             static cppu::OTypeCollection collection(
-                getCppuType( (Reference< com::sun::star::sdbcx::XRename> *) 0 ),
+                cppu::UnoType<com::sun::star::sdbcx::XRename>::get(),
                 ReflectionBase::getTypes());
             pCollection = &collection;
         }
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 4e5514725176..202a83500b65 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -505,7 +505,7 @@ Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration(  ) thr
 
 ::com::sun::star::uno::Type SAL_CALL OSDBCDriverManager::getElementType(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)
 {
-    return ::getCppuType(static_cast< Reference< XDriver >* >(NULL));
+    return cppu::UnoType<XDriver>::get();
 }
 
 
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 1e003cb68d46..be2c75da4e13 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1205,9 +1205,9 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
         if (m_nFormatKey && m_xFormatter.is())
         {
             Any aValue = getNumberFormatProperty( m_xFormatter, m_nFormatKey, OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LOCALE) );
-            OSL_ENSURE(aValue.getValueType() == ::getCppuType((const ::com::sun::star::lang::Locale*)0), "OSQLParser::PredicateTree : invalid language property !");
+            OSL_ENSURE(aValue.getValueType() == cppu::UnoType<com::sun::star::lang::Locale>::get(), "OSQLParser::PredicateTree : invalid language property !");
 
-            if (aValue.getValueType() == ::getCppuType((const ::com::sun::star::lang::Locale*)0))
+            if (aValue.getValueType() == cppu::UnoType<com::sun::star::lang::Locale>::get())
                 aValue >>= m_pData->aLocale;
         }
         else
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);