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

Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9

2 files changed, 9 insertions, 9 deletions

diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 2201b7a367de..d80d29ba46d4 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -92,11 +92,11 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs
             /* Create a static typecollection ...           */
             static ::cppu::OTypeCollection aTypeCollection
                 (
-                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::lang::XTypeProvider >*)NULL ),
-                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::lang::XServiceInfo >*)NULL ),
-                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::frame::XNotifyingDispatch >*)NULL ),
-                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::frame::XDispatch >*)NULL ),
-                    ::getCppuType(( const ::com::sun::star::uno::Reference< css::document::XExtendedFilterDetection >*)NULL )
+                    cppu::UnoType<css::lang::XTypeProvider>::get(),
+                    cppu::UnoType<css::lang::XServiceInfo>::get(),
+                    cppu::UnoType<css::frame::XNotifyingDispatch>::get(),
+                    cppu::UnoType<css::frame::XDispatch>::get(),
+                    cppu::UnoType<css::document::XExtendedFilterDetection>::get()
                 );
             /* ... and set his address to static pointer! */
             pTypeCollection = &aTypeCollection ;
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 029ad40cfec0..7ba550ac36d5 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -532,7 +532,7 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
 
 void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
 {
-    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
 
     if( pContainer )
     {
@@ -545,7 +545,7 @@ void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEv
 
 void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
 {
-    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseListener>::get());
 
     if( pContainer )
     {
@@ -558,7 +558,7 @@ void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rE
 
 void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
 {
-    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseMotionListener >*) 0 ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XMouseMotionListener>::get());
 
     if( pContainer )
     {
@@ -571,7 +571,7 @@ void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt
 
 void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
 {
-    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XFocusListener >*) 0 ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( cppu::UnoType<awt::XFocusListener>::get());
 
     if( pContainer )
     {