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

Change-Id: Ibccaa2138426c22cd63d273a1b6cdc927ebe80dc

7 files changed, 58 insertions, 58 deletions

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 2bb477c4fc82..048655c40f4b 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -118,7 +118,7 @@ void OCommonEmbeddedObject::StateChangeNotification_Impl( bool bBeforeChange, sa
     if ( m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer(
-                            ::getCppuType( ( const uno::Reference< embed::XStateChangeListener >*) NULL ) );
+                            cppu::UnoType<embed::XStateChangeListener>::get());
         if ( pContainer != NULL )
         {
             lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) );
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index eda750f7c991..8df625dc06b9 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -323,7 +323,7 @@ void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
     if ( m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pIC = m_pInterfaceContainer->getContainer(
-                                            ::getCppuType((const uno::Reference< document::XEventListener >*)0) );
+                                            cppu::UnoType<document::XEventListener>::get());
         if( pIC )
         {
             document::EventObject aEvent;
@@ -358,7 +358,7 @@ uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface( const uno::Type& rType
 {
     uno::Any aReturn;
 
-    if ( rType == ::getCppuType( (uno::Reference< embed::XEmbeddedObject > const *)0 ))
+    if ( rType == cppu::UnoType<embed::XEmbeddedObject>::get() )
     {
         void * p = static_cast< embed::XEmbeddedObject * >( this );
         return uno::Any( &p, rType );
@@ -414,24 +414,24 @@ uno::Sequence< uno::Type > SAL_CALL OCommonEmbeddedObject::getTypes()
             if ( m_bIsLink )
             {
                 static ::cppu::OTypeCollection aTypeCollection(
-                                            ::getCppuType( (const uno::Reference< lang::XTypeProvider >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< embed::XEmbeddedObject >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< embed::XInplaceObject >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< embed::XCommonEmbedPersist >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< container::XChild >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< embed::XLinkageSupport >*)NULL ) );
+                                            cppu::UnoType<lang::XTypeProvider>::get(),
+                                            cppu::UnoType<embed::XEmbeddedObject>::get(),
+                                            cppu::UnoType<embed::XInplaceObject>::get(),
+                                            cppu::UnoType<embed::XCommonEmbedPersist>::get(),
+                                            cppu::UnoType<container::XChild>::get(),
+                                            cppu::UnoType<embed::XLinkageSupport>::get());
 
                 pTypeCollection = &aTypeCollection ;
             }
             else
             {
                    static ::cppu::OTypeCollection aTypeCollection(
-                                            ::getCppuType( (const uno::Reference< lang::XTypeProvider >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< embed::XEmbeddedObject >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< embed::XInplaceObject >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< embed::XCommonEmbedPersist >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< container::XChild >*)NULL ),
-                                            ::getCppuType( (const uno::Reference< embed::XEmbedPersist >*)NULL ) );
+                                            cppu::UnoType<lang::XTypeProvider>::get(),
+                                            cppu::UnoType<embed::XEmbeddedObject>::get(),
+                                            cppu::UnoType<embed::XInplaceObject>::get(),
+                                            cppu::UnoType<embed::XCommonEmbedPersist>::get(),
+                                            cppu::UnoType<container::XChild>::get(),
+                                            cppu::UnoType<embed::XEmbedPersist>::get());
 
                 pTypeCollection = &aTypeCollection ;
             }
@@ -509,7 +509,7 @@ void SAL_CALL OCommonEmbeddedObject::addStateChangeListener( const uno::Referenc
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ),
+    m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                         xListener );
 }
 
@@ -520,7 +520,7 @@ void SAL_CALL OCommonEmbeddedObject::removeStateChangeListener(
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                 xListener );
 }
 
@@ -539,7 +539,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
     if ( m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pContainer =
-            m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) );
+            m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -557,7 +557,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
         }
 
         pContainer = m_pInterfaceContainer->getContainer(
-                                    ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) );
+                                    cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
@@ -640,7 +640,7 @@ void SAL_CALL OCommonEmbeddedObject::addCloseListener( const uno::Reference< uti
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
 
 
@@ -649,7 +649,7 @@ void SAL_CALL OCommonEmbeddedObject::removeCloseListener( const uno::Reference<
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XCloseListener>::get(),
                                                 xListener );
 }
 
@@ -664,7 +664,7 @@ void SAL_CALL OCommonEmbeddedObject::addEventListener( const uno::Reference< doc
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
 }
 
 
@@ -673,7 +673,7 @@ void SAL_CALL OCommonEmbeddedObject::removeEventListener( const uno::Reference<
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<document::XEventListener>::get(),
                                                 xListener );
 }
 
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index 1342103c13bb..c98b79788377 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -83,9 +83,9 @@ uno::Sequence< uno::Type > SAL_CALL OSpecialEmbeddedObject::getTypes()
         if ( !pTypeCollection )
         {
             static ::cppu::OTypeCollection aTypeCollection(
-                                        ::getCppuType( (const uno::Reference< lang::XTypeProvider >*)NULL ),
-                                        ::getCppuType( (const uno::Reference< embed::XEmbeddedObject >*)NULL ),
-                                        ::getCppuType( (const uno::Reference< embed::XInplaceObject >*)NULL ) );
+                                        cppu::UnoType<lang::XTypeProvider>::get(),
+                                        cppu::UnoType<embed::XEmbeddedObject>::get(),
+                                        cppu::UnoType<embed::XInplaceObject>::get());
 
             pTypeCollection = &aTypeCollection ;
         }
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 531cb8fd0064..d4a14811a486 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -62,7 +62,7 @@ void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
     if ( m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pIC = m_pInterfaceContainer->getContainer(
-                                            ::getCppuType((const uno::Reference< document::XEventListener >*)0) );
+                                            cppu::UnoType<document::XEventListener>::get());
         if( pIC )
         {
             document::EventObject aEvent;
@@ -596,7 +596,7 @@ void SAL_CALL ODummyEmbeddedObject::addStateChangeListener( const uno::Reference
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ),
+    m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                         xListener );
 }
 
@@ -607,7 +607,7 @@ void SAL_CALL ODummyEmbeddedObject::removeStateChangeListener(
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                 xListener );
 }
 
@@ -626,7 +626,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
     if ( m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pContainer =
-            m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) );
+            m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -644,7 +644,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
         }
 
         pContainer = m_pInterfaceContainer->getContainer(
-                                    ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) );
+                                    cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
@@ -678,7 +678,7 @@ void SAL_CALL ODummyEmbeddedObject::addCloseListener( const uno::Reference< util
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
 
 
@@ -687,7 +687,7 @@ void SAL_CALL ODummyEmbeddedObject::removeCloseListener( const uno::Reference< u
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XCloseListener>::get(),
                                                 xListener );
 }
 
@@ -702,7 +702,7 @@ void SAL_CALL ODummyEmbeddedObject::addEventListener( const uno::Reference< docu
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
 }
 
 
@@ -711,7 +711,7 @@ void SAL_CALL ODummyEmbeddedObject::removeEventListener( const uno::Reference< d
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<document::XEventListener>::get(),
                                                 xListener );
 }
 
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index e8d65883f85d..8e000702f98a 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -1440,7 +1440,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
     if ( m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pContainer =
-            m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >* ) NULL ) );
+            m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
@@ -1458,7 +1458,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
         }
 
         pContainer = m_pInterfaceContainer->getContainer(
-                                    ::getCppuType( ( const uno::Reference< util::XCloseListener >* ) NULL ) );
+                                    cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pCloseIterator( *pContainer );
@@ -1490,7 +1490,7 @@ void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XClose
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( ( const uno::Reference< util::XCloseListener >* )0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
 
 
@@ -1502,7 +1502,7 @@ void SAL_CALL OleComponent::removeCloseListener( const uno::Reference< util::XCl
         throw lang::DisposedException(); // TODO
 
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( ( const uno::Reference< util::XCloseListener >* )0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XCloseListener>::get(),
                                                 xListener );
 }
 
@@ -1576,7 +1576,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
     }
     // TODO: Investigate if there is already the format name
     //       and whether this format is really required
-    else if ( aFlavor.DataType == getCppuType( ( const uno::Reference< io::XInputStream >* ) 0 )
+    else if ( aFlavor.DataType == cppu::UnoType<io::XInputStream>::get()
             && aFlavor.MimeType == "application/x-openoffice-contentstream" )
     {
         // allow to retrieve stream-representation of the object persistence
@@ -1670,7 +1670,7 @@ void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEvent
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* )0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<lang::XEventListener>::get(), xListener );
 }
 
 
@@ -1682,7 +1682,7 @@ void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEv
         throw lang::DisposedException(); // TODO
 
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* )0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<lang::XEventListener>::get(),
                                                 xListener );
 }
 
@@ -1732,7 +1732,7 @@ void SAL_CALL OleComponent::setModified( sal_Bool bModified )
     if ( bModified && m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pContainer =
-            m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XModifyListener >* ) NULL ) );
+            m_pInterfaceContainer->getContainer( cppu::UnoType<util::XModifyListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
@@ -1761,7 +1761,7 @@ void SAL_CALL OleComponent::addModifyListener( const com::sun::star::uno::Refere
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( ( const uno::Reference< util::XModifyListener >* )0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<util::XModifyListener>::get(), xListener );
 }
 
 void SAL_CALL OleComponent::removeModifyListener( const com::sun::star::uno::Reference < com::sun::star::util::XModifyListener >& xListener) throw(::com::sun::star::uno::RuntimeException)
@@ -1771,7 +1771,7 @@ void SAL_CALL OleComponent::removeModifyListener( const com::sun::star::uno::Ref
         throw lang::DisposedException(); // TODO
 
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( ( const uno::Reference< util::XModifyListener >* )0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XModifyListener>::get(),
                                                 xListener );
 }
 
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 9c6326bbb5df..4a43d1ed891d 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -125,7 +125,7 @@ void OleEmbeddedObject::MoveListeners()
         // move state change listeners
         {
             ::cppu::OInterfaceContainerHelper* pStateChangeContainer =
-                m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< embed::XStateChangeListener >*) NULL ) );
+                m_pInterfaceContainer->getContainer( cppu::UnoType<embed::XStateChangeListener>::get());
             if ( pStateChangeContainer != NULL )
             {
                 uno::Reference< embed::XStateChangeBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -150,7 +150,7 @@ void OleEmbeddedObject::MoveListeners()
         // move event listeners
         {
             ::cppu::OInterfaceContainerHelper* pEventContainer =
-                m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< document::XEventListener >*) NULL ) );
+                m_pInterfaceContainer->getContainer( cppu::UnoType<document::XEventListener>::get());
             if ( pEventContainer != NULL )
             {
                 uno::Reference< document::XEventBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
@@ -175,7 +175,7 @@ void OleEmbeddedObject::MoveListeners()
         // move close listeners
         {
             ::cppu::OInterfaceContainerHelper* pCloseContainer =
-                m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) );
+                m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
             if ( pCloseContainer != NULL )
             {
                 uno::Reference< util::XCloseBroadcaster > xWrappedObject( m_xWrappedObject, uno::UNO_QUERY );
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 7bd0354d5f69..8e321806ccbf 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -167,7 +167,7 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve
     {
            ::cppu::OInterfaceContainerHelper* pContainer =
             m_pInterfaceContainer->getContainer(
-                                    ::getCppuType( ( const uno::Reference< document::XEventListener >*) NULL ) );
+                                    cppu::UnoType<document::XEventListener>::get());
         if ( pContainer != NULL )
         {
             document::EventObject aEvent( static_cast< ::cppu::OWeakObject* >( this ), aEventName );
@@ -192,7 +192,7 @@ void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sa
     if ( m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pContainer = m_pInterfaceContainer->getContainer(
-                            ::getCppuType( ( const uno::Reference< embed::XStateChangeListener >*) NULL ) );
+                            cppu::UnoType<embed::XStateChangeListener>::get());
         if ( pContainer != NULL )
         {
             lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >( this ) );
@@ -421,7 +421,7 @@ void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< e
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ),
+    m_pInterfaceContainer->addInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                         xListener );
 }
 
@@ -442,7 +442,7 @@ void SAL_CALL OleEmbeddedObject::removeStateChangeListener(
 
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< embed::XStateChangeListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<embed::XStateChangeListener>::get(),
                                                 xListener );
 }
 
@@ -472,7 +472,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
     if ( m_pInterfaceContainer )
     {
         ::cppu::OInterfaceContainerHelper* pContainer =
-            m_pInterfaceContainer->getContainer( ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) );
+            m_pInterfaceContainer->getContainer( cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
@@ -490,7 +490,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
         }
 
         pContainer = m_pInterfaceContainer->getContainer(
-                                    ::getCppuType( ( const uno::Reference< util::XCloseListener >*) NULL ) );
+                                    cppu::UnoType<util::XCloseListener>::get());
         if ( pContainer != NULL )
         {
             ::cppu::OInterfaceIteratorHelper pCloseIterator(*pContainer);
@@ -532,7 +532,7 @@ void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::X
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<util::XCloseListener>::get(), xListener );
 }
 
 
@@ -554,7 +554,7 @@ void SAL_CALL OleEmbeddedObject::removeCloseListener( const uno::Reference< util
         throw lang::DisposedException(); // TODO
 
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<util::XCloseListener>::get(),
                                                 xListener );
 }
 
@@ -579,7 +579,7 @@ void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< documen
     if ( !m_pInterfaceContainer )
         m_pInterfaceContainer = new ::cppu::OMultiTypeInterfaceContainerHelper( m_aMutex );
 
-    m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener );
+    m_pInterfaceContainer->addInterface( cppu::UnoType<document::XEventListener>::get(), xListener );
 }
 
 
@@ -602,7 +602,7 @@ void SAL_CALL OleEmbeddedObject::removeEventListener(
         throw lang::DisposedException(); // TODO
 
     if ( m_pInterfaceContainer )
-        m_pInterfaceContainer->removeInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ),
+        m_pInterfaceContainer->removeInterface( cppu::UnoType<document::XEventListener>::get(),
                                                 xListener );
 }