Replace remaining getCppuType et al with cppu::UnoType

Change-Id: Ibe0017f69442b345f66d0cde9445dc5aed9e6542

4 files changed, 6 insertions, 6 deletions

diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 6e70b78d2eea..84488d85a1c8 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -58,13 +58,13 @@ namespace svt
         registerProperty(
             OUString( "HelpURL" ), PROPERTY_ID_HELPURL,
             PropertyAttribute::TRANSIENT,
-            &m_sHelpURL, ::getCppuType( &m_sHelpURL )
+            &m_sHelpURL, cppu::UnoType<decltype(m_sHelpURL)>::get()
         );
 
         registerProperty(
             OUString( "Window" ), PROPERTY_ID_WINDOW,
             PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY,
-            &m_xWindow, ::getCppuType( &m_xWindow )
+            &m_xWindow, cppu::UnoType<decltype(m_xWindow)>::get()
         );
     }
 
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index 6906d29ae07e..fda664ac5496 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -99,7 +99,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
             static_cast< XFilePicker2* >( this ) );
 
     if ( !rBHelper.bInDispose && !rBHelper.bDisposed )
-        rBHelper.aLC.addInterface( getCppuType( &xListener ), xListener );
+        rBHelper.aLC.addInterface(cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
@@ -114,7 +114,7 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
             "object is already disposed",
             static_cast< XFilePicker2* >( this ) );
 
-    rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
+    rBHelper.aLC.removeInterface(cppu::UnoType<decltype(xListener)>::get(), xListener );
 }
 
 
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index 347d88acd481..8c189ffbef93 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -81,7 +81,7 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s
         throw IllegalArgumentException(
             "unsupported image format", 0, 1);
 
-    if (aImage.hasValue() && (aImage.getValueType() != getCppuType((Sequence<sal_Int8>*)0)))
+    if (aImage.hasValue() && (aImage.getValueType() != cppu::UnoType<Sequence<sal_Int8>>::get()))
         throw IllegalArgumentException(
             "invalid image data", 0, 2);
 
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 6e4dcd2a4b9f..df12f544950e 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -166,7 +166,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
     OSL_ASSERT( IsWindow( hwnd ) );
 
     if ( !aItemList.hasValue( ) ||
-         aItemList.getValueType( ) != getCppuType((Sequence<OUString>*)0) )
+         aItemList.getValueType( ) != cppu::UnoType<Sequence<OUString>>::get() )
          throw IllegalArgumentException(
             "invalid value type or any has no value",
             rXInterface,