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

Change-Id: Ie16923d17541e84e0d7424fffe37caf410786abf

7 files changed, 12 insertions, 12 deletions

diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index 98953bf60b79..fee760708b90 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -47,7 +47,7 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
     if (!m_bInitialized)
     {
         for (sal_Int32 n = 0, nmax = aArguments.getLength(); n < nmax; n++)
-            if (aArguments[n].getValueType() == getCppuType((OUString *) 0))
+            if (aArguments[n].getValueType() == cppu::UnoType<OUString>::get())
             {
                 aArguments[0] >>= m_aName;
                 break;
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index a8503a61811e..3e5c0a7dbea3 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -187,7 +187,7 @@ StringTransferable::StringTransferable( ) :
 
     /*
     df.MimeType = L"text/plain; charset=unicode";
-    df.DataType = getCppuType( ( OUString* )0 );
+    df.DataType = cppu::UnoType<OUString>::get();
 
     m_seqDFlv[0] = df;
     */
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 475ecadac7d3..a88b32bc2534 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -45,7 +45,7 @@ using namespace com::sun::star::container;
 namespace
 {
     const Type CPPUTYPE_SEQINT8  = getCppuType( ( Sequence< sal_Int8 >* )0 );
-    const Type CPPUTYPE_OUSTRING = getCppuType( (OUString*)0 );
+    const Type CPPUTYPE_OUSTRING = cppu::UnoType<OUString>::get();
 
     inline
     sal_Bool isValidFlavor( const DataFlavor& aFlavor )
@@ -536,7 +536,7 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
         {
             IDataObject* pObj= m_rDataObject.get();
             pObj->AddRef();
-            retVal.setValue( &pObj, getCppuType((sal_uInt32*)0));
+            retVal.setValue( &pObj, cppu::UnoType<sal_uInt32>::get());
         }
     }
     return retVal;
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index d1109ec69cc8..37c8dd86e746 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -46,9 +46,9 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::datatransfer;
 using namespace com::sun::star::lang;
 
-const Type       CPPUTYPE_SALINT32   = getCppuType((sal_Int32*)0);
-const Type       CPPUTYPE_SALINT8    = getCppuType((sal_Int8*)0);
-const Type       CPPUTYPE_OUSTRING   = getCppuType((OUString*)0);
+const Type       CPPUTYPE_SALINT32   = cppu::UnoType<sal_Int32>::get();
+const Type       CPPUTYPE_SALINT8    = cppu::UnoType<sal_Int8>::get();
+const Type       CPPUTYPE_OUSTRING   = cppu::UnoType<OUString>::get();
 const Type       CPPUTYPE_SEQSALINT8 = getCppuType((Sequence< sal_Int8>*)0);
 const sal_Int32  MAX_CLIPFORMAT_NAME = 256;
 
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 4348a7058085..156f4fac96f4 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -40,13 +40,13 @@
 #define MODULE_PRIVATE
 #define CPPUTYPE_SEQSALINT8       getCppuType( (const Sequence< sal_Int8 >*) 0 )
 #define CPPUTYPE_DEFAULT          CPPUTYPE_SEQSALINT8
-#define CPPUTYPE_OUSTR            getCppuType( (const OUString*) 0 )
-#define CPPUTYPE_SALINT32         getCppuType( ( sal_Int32 * ) 0 )
+#define CPPUTYPE_OUSTR            cppu::UnoType<OUString>::get()
+#define CPPUTYPE_SALINT32         cppu::UnoType<sal_Int32>::get()
 #define EMPTY_OUSTR               OUString()
 
 const OUString Windows_FormatName ("windows_formatname");
 const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0);
-const com::sun::star::uno::Type CppuType_String       = ::getCppuType((const OUString*)0);
+const com::sun::star::uno::Type CppuType_String       = ::cppu::UnoType<OUString>::get();
 
 // namespace directives
 
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index a065dc002b0b..0527ae4facce 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -130,7 +130,7 @@ CTransferable::CTransferable( ) :
     DataFlavor df;
 
     //df.MimeType = L"text/plain;charset=utf-16";
-    //df.DataType = getCppuType( ( OUString* )0 );
+    //df.DataType = cppu::UnoType<OUString>::get();
 
     df.MimeType = L"text/plain;charset=Windows1252";
     df.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
diff --git a/dtrans/test/win32/dnd/transferable.cxx b/dtrans/test/win32/dnd/transferable.cxx
index 87dbc79ef13f..b9bd35f82928 100644
--- a/dtrans/test/win32/dnd/transferable.cxx
+++ b/dtrans/test/win32/dnd/transferable.cxx
@@ -29,7 +29,7 @@ CTransferable::CTransferable( wchar_t* dataString ) :
 
     /*
     df.MimeType = L"text/plain; charset=unicode";
-    df.DataType = getCppuType( ( OUString* )0 );
+    df.DataType = cppu::UnoType<OUString>::get();
 
     m_seqDFlv[0] = df;
     */