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

Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68

5 files changed, 8 insertions, 8 deletions

diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 6b4aab4a609c..842ab0564830 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -180,7 +180,7 @@ OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
     OUString aHelpText;
 
     ::cppu::OInterfaceContainerHelper* pICHelper =
-        rBHelper.getContainer( getCppuType((uno::Reference<XFilePickerListener>*)0));
+        rBHelper.getContainer( cppu::UnoType<XFilePickerListener>::get());
 
     if (pICHelper)
     {
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index e6cec940e2b8..ef77bb3fdb2a 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -207,14 +207,14 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi
 void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
     throw( css::uno::RuntimeException )
 {
-    m_lListener.addInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener);
+    m_lListener.addInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
 
 
 void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
     throw( css::uno::RuntimeException )
 {
-    m_lListener.removeInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener);
+    m_lListener.removeInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener);
 }
 
 
@@ -305,7 +305,7 @@ void VistaFilePickerEventHandler::impl_sendEvent(  EEventType eEventType,
 {
     static AsyncRequests aNotify(RequestHandlerRef(new AsyncPickerEvents()));
 
-    ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer( ::getCppuType( ( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*) NULL ) );
+    ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer( cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get());
     if ( ! pContainer)
         return;
 
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 9eb1401e42d3..7d116d71620d 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -263,7 +263,7 @@ void SAL_CALL CAsyncEventNotifier::run()
                 removeNextEventRecord();
 
                 ::cppu::OInterfaceContainerHelper* pICHelper =
-                    m_rBroadcastHelper.getContainer(getCppuType((uno::Reference<XFilePickerListener>*)0));
+                    m_rBroadcastHelper.getContainer(cppu::UnoType<XFilePickerListener>::get());
 
                 if (pICHelper)
                 {
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 3576aa1467e7..9c5921f81865 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -296,7 +296,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
         Any aAny;
         sal_Bool bChkState = sal_False;
 
-        aAny.setValue( &bChkState, getCppuType( (sal_Bool*)0 ) );
+        aAny.setValue( &bChkState, cppu::UnoType<sal_Bool>::get());
         xFPControlAccess->setValue( CHECKBOX_AUTOEXTENSION, 0, aAny );
 
         OUString aVersion( L"Version 1" );
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 6011bcf18694..e12241c09611 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -333,7 +333,7 @@ Any SAL_CALL CheckboxGetState( HWND hwnd )
     LRESULT lChkState = SendMessageW( hwnd, BM_GETCHECK, 0, 0 );
     sal_Bool bChkState = (lChkState == BST_CHECKED) ? sal_True : sal_False;
     Any aAny;
-    aAny.setValue( &bChkState, getCppuType((sal_Bool*)0) );
+    aAny.setValue( &bChkState, cppu::UnoType<sal_Bool>::get());
     return aAny;
 }
 
@@ -348,7 +348,7 @@ void SAL_CALL CheckboxSetState(
     OSL_ASSERT( IsWindow( hwnd ) );
 
     if ( !aState.hasValue( ) ||
-         aState.getValueType( ) != getCppuType((sal_Bool*)0) )
+         aState.getValueType( ) != cppu::UnoType<sal_Bool>::get())
          throw IllegalArgumentException(
             OUString( "invalid value type or any has no value" ),
             rXInterface,