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

Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68

5 files changed, 111 insertions, 111 deletions

diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx
index be18fba7f496..cf5db722a906 100644
--- a/package/source/xstor/oseekinstream.cxx
+++ b/package/source/xstor/oseekinstream.cxx
@@ -67,7 +67,7 @@ uno::Sequence< uno::Type > SAL_CALL OInputSeekStream::getTypes()
         if ( pTypeCollection == NULL )
         {
             static ::cppu::OTypeCollection aTypeCollection(
-                    ::getCppuType(( const uno::Reference< io::XSeekable >* )NULL ),
+                    cppu::UnoType<io::XSeekable>::get(),
                     OInputCompStream::getTypes() );
 
             pTypeCollection = &aTypeCollection ;
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 4ec30e962931..5de31ab99ee7 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -1933,53 +1933,53 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
                 if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
                 {
                     ::cppu::OTypeCollection aTmpCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource2 >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<io::XInputStream>::get()
+                                    ,   cppu::UnoType<io::XOutputStream>::get()
+                                    ,   cppu::UnoType<io::XStream>::get()
+                                    ,   cppu::UnoType<io::XSeekable>::get()
+                                    ,   cppu::UnoType<io::XTruncate>::get()
+                                    ,   cppu::UnoType<lang::XComponent>::get()
+                                    ,   cppu::UnoType<embed::XEncryptionProtectedSource2>::get()
+                                    ,   cppu::UnoType<embed::XEncryptionProtectedSource>::get()
+                                    ,   cppu::UnoType<embed::XExtendedStorageStream>::get()
+                                    ,   cppu::UnoType<embed::XTransactedObject>::get()
+                                    ,   cppu::UnoType<embed::XTransactionBroadcaster>::get());
 
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL )
+                                    (   cppu::UnoType<beans::XPropertySet>::get()
                                     ,   aTmpCollection.getTypes() );
                 }
                 else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<io::XInputStream>::get()
+                                    ,   cppu::UnoType<io::XOutputStream>::get()
+                                    ,   cppu::UnoType<io::XStream>::get()
+                                    ,   cppu::UnoType<io::XSeekable>::get()
+                                    ,   cppu::UnoType<io::XTruncate>::get()
+                                    ,   cppu::UnoType<lang::XComponent>::get()
+                                    ,   cppu::UnoType<embed::XRelationshipAccess>::get()
+                                    ,   cppu::UnoType<embed::XExtendedStorageStream>::get()
+                                    ,   cppu::UnoType<embed::XTransactedObject>::get()
+                                    ,   cppu::UnoType<embed::XTransactionBroadcaster>::get()
+                                    ,   cppu::UnoType<beans::XPropertySet>::get());
                 }
                 else // if ( m_pData->m_nStorageType == embed::StorageFormats::ZIP )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XExtendedStorageStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<io::XInputStream>::get()
+                                    ,   cppu::UnoType<io::XOutputStream>::get()
+                                    ,   cppu::UnoType<io::XStream>::get()
+                                    ,   cppu::UnoType<io::XSeekable>::get()
+                                    ,   cppu::UnoType<io::XTruncate>::get()
+                                    ,   cppu::UnoType<lang::XComponent>::get()
+                                    ,   cppu::UnoType<embed::XExtendedStorageStream>::get()
+                                    ,   cppu::UnoType<embed::XTransactedObject>::get()
+                                    ,   cppu::UnoType<embed::XTransactionBroadcaster>::get()
+                                    ,   cppu::UnoType<beans::XPropertySet>::get());
                 }
             }
             else
@@ -1987,41 +1987,41 @@ uno::Sequence< uno::Type > SAL_CALL OWriteStream::getTypes()
                 if ( m_pData->m_nStorageType == embed::StorageFormats::PACKAGE )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource2 >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<io::XInputStream>::get()
+                                    ,   cppu::UnoType<io::XOutputStream>::get()
+                                    ,   cppu::UnoType<io::XStream>::get()
+                                    ,   cppu::UnoType<io::XSeekable>::get()
+                                    ,   cppu::UnoType<io::XTruncate>::get()
+                                    ,   cppu::UnoType<lang::XComponent>::get()
+                                    ,   cppu::UnoType<embed::XEncryptionProtectedSource2>::get()
+                                    ,   cppu::UnoType<embed::XEncryptionProtectedSource>::get()
+                                    ,   cppu::UnoType<beans::XPropertySet>::get());
                 }
                 else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<io::XInputStream>::get()
+                                    ,   cppu::UnoType<io::XOutputStream>::get()
+                                    ,   cppu::UnoType<io::XStream>::get()
+                                    ,   cppu::UnoType<io::XSeekable>::get()
+                                    ,   cppu::UnoType<io::XTruncate>::get()
+                                    ,   cppu::UnoType<lang::XComponent>::get()
+                                    ,   cppu::UnoType<embed::XRelationshipAccess>::get()
+                                    ,   cppu::UnoType<beans::XPropertySet>::get());
                 }
                 else // if ( m_pData->m_nStorageType == embed::StorageFormats::ZIP )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XInputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XOutputStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XStream >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XSeekable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< io::XTruncate >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< lang::XComponent >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<io::XInputStream>::get()
+                                    ,   cppu::UnoType<io::XOutputStream>::get()
+                                    ,   cppu::UnoType<io::XStream>::get()
+                                    ,   cppu::UnoType<io::XSeekable>::get()
+                                    ,   cppu::UnoType<io::XTruncate>::get()
+                                    ,   cppu::UnoType<lang::XComponent>::get()
+                                    ,   cppu::UnoType<beans::XPropertySet>::get());
                 }
             }
         }
@@ -2500,7 +2500,7 @@ void SAL_CALL OWriteStream::addEventListener(
         throw lang::DisposedException();
     }
 
-    m_pData->m_aListenersContainer.addInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0),
+    m_pData->m_aListenersContainer.addInterface( cppu::UnoType<lang::XEventListener>::get(),
                                                  xListener );
 }
 
@@ -2516,7 +2516,7 @@ void SAL_CALL OWriteStream::removeEventListener(
         throw lang::DisposedException();
     }
 
-    m_pData->m_aListenersContainer.removeInterface( ::getCppuType((const uno::Reference< lang::XEventListener >*)0),
+    m_pData->m_aListenersContainer.removeInterface( cppu::UnoType<lang::XEventListener>::get(),
                                                     xListener );
 }
 
@@ -3245,7 +3245,7 @@ void OWriteStream::BroadcastTransaction( sal_Int8 nMessage )
 
        ::cppu::OInterfaceContainerHelper* pContainer =
             m_pData->m_aListenersContainer.getContainer(
-                ::getCppuType( ( const uno::Reference< embed::XTransactionListener >*) NULL ) );
+                cppu::UnoType<embed::XTransactionListener>::get());
        if ( pContainer )
     {
            ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
@@ -3416,7 +3416,7 @@ void SAL_CALL OWriteStream::addTransactionListener( const uno::Reference< embed:
     if ( !m_bTransacted )
         throw uno::RuntimeException();
 
-    m_pData->m_aListenersContainer.addInterface( ::getCppuType((const uno::Reference< embed::XTransactionListener >*)0),
+    m_pData->m_aListenersContainer.addInterface( cppu::UnoType<embed::XTransactionListener>::get(),
                                                 aListener );
 }
 
@@ -3434,7 +3434,7 @@ void SAL_CALL OWriteStream::removeTransactionListener( const uno::Reference< emb
     if ( !m_bTransacted )
         throw uno::RuntimeException();
 
-    m_pData->m_aListenersContainer.removeInterface( ::getCppuType((const uno::Reference< embed::XTransactionListener >*)0),
+    m_pData->m_aListenersContainer.removeInterface( cppu::UnoType<embed::XTransactionListener>::get(),
                                                     aListener );
 }
 
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 0a6adcd0e08b..61cfbe642ec9 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -2074,7 +2074,7 @@ void OStorage::BroadcastModifiedIfNecessary()
 
        ::cppu::OInterfaceContainerHelper* pContainer =
             m_pData->m_aListenersContainer.getContainer(
-                ::getCppuType( ( const uno::Reference< util::XModifyListener >*) NULL ) );
+                cppu::UnoType<util::XModifyListener>::get());
        if ( pContainer )
     {
            ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
@@ -2106,7 +2106,7 @@ void OStorage::BroadcastTransaction( sal_Int8 nMessage )
 
        ::cppu::OInterfaceContainerHelper* pContainer =
             m_pData->m_aListenersContainer.getContainer(
-                ::getCppuType( ( const uno::Reference< embed::XTransactionListener >*) NULL ) );
+                cppu::UnoType<embed::XTransactionListener>::get());
        if ( pContainer )
     {
            ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
@@ -2277,51 +2277,51 @@ uno::Sequence< uno::Type > SAL_CALL OStorage::getTypes()
                 if ( m_pData->m_bIsRoot )
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorage2 >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorageRawAccess >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedStorage >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource2 >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XEncryptionProtectedSource >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<embed::XStorage>::get()
+                                    ,   cppu::UnoType<embed::XStorage2>::get()
+                                    ,   cppu::UnoType<embed::XStorageRawAccess>::get()
+                                    ,   cppu::UnoType<embed::XTransactedObject>::get()
+                                    ,   cppu::UnoType<embed::XTransactionBroadcaster>::get()
+                                    ,   cppu::UnoType<util::XModifiable>::get()
+                                    ,   cppu::UnoType<embed::XEncryptionProtectedStorage>::get()
+                                    ,   cppu::UnoType<embed::XEncryptionProtectedSource2>::get()
+                                    ,   cppu::UnoType<embed::XEncryptionProtectedSource>::get()
+                                    ,   cppu::UnoType<beans::XPropertySet>::get());
                 }
                 else
                 {
                     m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                    (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorage2 >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XStorageRawAccess >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
-                                    ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                    (   cppu::UnoType<lang::XTypeProvider>::get()
+                                    ,   cppu::UnoType<embed::XStorage>::get()
+                                    ,   cppu::UnoType<embed::XStorage2>::get()
+                                    ,   cppu::UnoType<embed::XStorageRawAccess>::get()
+                                    ,   cppu::UnoType<embed::XTransactedObject>::get()
+                                    ,   cppu::UnoType<embed::XTransactionBroadcaster>::get()
+                                    ,   cppu::UnoType<util::XModifiable>::get()
+                                    ,   cppu::UnoType<beans::XPropertySet>::get());
                 }
             }
             else if ( m_pData->m_nStorageType == embed::StorageFormats::OFOPXML )
             {
                 m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XRelationshipAccess >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                (   cppu::UnoType<lang::XTypeProvider>::get()
+                                ,   cppu::UnoType<embed::XStorage>::get()
+                                ,   cppu::UnoType<embed::XTransactedObject>::get()
+                                ,   cppu::UnoType<embed::XTransactionBroadcaster>::get()
+                                ,   cppu::UnoType<util::XModifiable>::get()
+                                ,   cppu::UnoType<embed::XRelationshipAccess>::get()
+                                ,   cppu::UnoType<beans::XPropertySet>::get());
             }
             else
             {
                 m_pData->m_pTypeCollection = new ::cppu::OTypeCollection
-                                (   ::getCppuType( ( const uno::Reference< lang::XTypeProvider >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XStorage >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XTransactedObject >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< embed::XTransactionBroadcaster >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< util::XModifiable >* )NULL )
-                                ,   ::getCppuType( ( const uno::Reference< beans::XPropertySet >* )NULL ) );
+                                (   cppu::UnoType<lang::XTypeProvider>::get()
+                                ,   cppu::UnoType<embed::XStorage>::get()
+                                ,   cppu::UnoType<embed::XTransactedObject>::get()
+                                ,   cppu::UnoType<embed::XTransactionBroadcaster>::get()
+                                ,   cppu::UnoType<util::XModifiable>::get()
+                                ,   cppu::UnoType<beans::XPropertySet>::get());
             }
         }
     }
@@ -4098,7 +4098,7 @@ void SAL_CALL OStorage::addTransactionListener( const uno::Reference< embed::XTr
         throw lang::DisposedException( THROW_WHERE );
     }
 
-    m_pData->m_aListenersContainer.addInterface( ::getCppuType((const uno::Reference< embed::XTransactionListener >*)0),
+    m_pData->m_aListenersContainer.addInterface( cppu::UnoType<embed::XTransactionListener>::get(),
                                                 aListener );
 }
 
@@ -4113,7 +4113,7 @@ void SAL_CALL OStorage::removeTransactionListener( const uno::Reference< embed::
         throw lang::DisposedException( THROW_WHERE );
     }
 
-    m_pData->m_aListenersContainer.removeInterface( ::getCppuType((const uno::Reference< embed::XTransactionListener >*)0),
+    m_pData->m_aListenersContainer.removeInterface( cppu::UnoType<embed::XTransactionListener>::get(),
                                                     aListener );
 }
 
@@ -4176,7 +4176,7 @@ void SAL_CALL OStorage::addModifyListener(
 
     osl_atomic_increment( &m_pImpl->m_nModifiedListenerCount );
     m_pData->m_aListenersContainer.addInterface(
-                                ::getCppuType( ( const uno::Reference< util::XModifyListener >* )0 ), aListener );
+                                cppu::UnoType<util::XModifyListener>::get(), aListener );
 }
 
 void SAL_CALL OStorage::removeModifyListener(
@@ -4193,7 +4193,7 @@ void SAL_CALL OStorage::removeModifyListener(
 
     osl_atomic_decrement( &m_pImpl->m_nModifiedListenerCount );
     m_pData->m_aListenersContainer.removeInterface(
-                                ::getCppuType( ( const uno::Reference< util::XModifyListener >* )0 ), aListener );
+                                cppu::UnoType<util::XModifyListener>::get(), aListener );
 }
 
 //  XNameAccess
@@ -4436,7 +4436,7 @@ void SAL_CALL OStorage::addEventListener(
     }
 
     m_pData->m_aListenersContainer.addInterface(
-                                ::getCppuType( ( const uno::Reference< lang::XEventListener >* )0 ), xListener );
+                                cppu::UnoType<lang::XEventListener>::get(), xListener );
 }
 
 void SAL_CALL OStorage::removeEventListener(
@@ -4452,7 +4452,7 @@ void SAL_CALL OStorage::removeEventListener(
     }
 
     m_pData->m_aListenersContainer.removeInterface(
-                                ::getCppuType( ( const uno::Reference< lang::XEventListener >* )0 ), xListener );
+                                cppu::UnoType<lang::XEventListener>::get(), xListener );
 }
 
 //  XEncryptionProtectedSource
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index e232f1afeec9..8d994c6ede75 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -234,7 +234,7 @@ uno::Reference< XEnumeration > SAL_CALL ZipPackageFolder::createEnumeration(  )
 uno::Type SAL_CALL ZipPackageFolder::getElementType(  )
         throw(uno::RuntimeException, std::exception)
 {
-    return ::getCppuType ((const uno::Reference< XUnoTunnel > *) 0);
+    return cppu::UnoType<XUnoTunnel>::get();
 }
 sal_Bool SAL_CALL ZipPackageFolder::hasElements(  )
         throw(uno::RuntimeException, std::exception)
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 4cf2afbd7566..acb006336a99 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -316,7 +316,7 @@ uno::Type SAL_CALL OZipFileAccess::getElementType()
     if ( !m_pZipFile )
         throw io::NotConnectedException(THROW_WHERE );
 
-    return getCppuType( ( const uno::Reference< io::XInputStream >* )NULL );
+    return cppu::UnoType<io::XInputStream>::get();
 }
 
 sal_Bool SAL_CALL OZipFileAccess::hasElements()