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

Change-Id: If87cdfb2c605254f6d69baa4ca5aec09091caa68

5 files changed, 14 insertions, 14 deletions

diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx
index 0a3ac3142b17..5bf6622bbf31 100644
--- a/stoc/source/corereflection/crarray.cxx
+++ b/stoc/source/corereflection/crarray.cxx
@@ -60,7 +60,7 @@ Sequence< Type > ArrayIdlClassImpl::getTypes()
         if (! s_pTypes)
         {
             static ::cppu::OTypeCollection s_aTypes(
-                ::getCppuType( (const Reference< XIdlArray > *)0 ),
+                cppu::UnoType<XIdlArray>::get(),
                 IdlClassImpl::getTypes() );
             s_pTypes = &s_aTypes;
         }
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index f56e4238f1f8..91442274bde5 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -102,8 +102,8 @@ Sequence< Type > IdlCompFieldImpl::getTypes()
         if (! s_pTypes)
         {
             static ::cppu::OTypeCollection s_aTypes(
-                ::getCppuType( (const Reference< XIdlField2 > *)0 ),
-                ::getCppuType( (const Reference< XIdlField > *)0 ),
+                cppu::UnoType<XIdlField2>::get(),
+                cppu::UnoType<XIdlField>::get(),
                 IdlMemberImpl::getTypes() );
             s_pTypes = &s_aTypes;
         }
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index dcf74a4a3f8b..66ad8c703fcf 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -108,9 +108,9 @@ Sequence< Type > IdlReflectionServiceImpl::getTypes()
         if (! s_pTypes)
         {
             static OTypeCollection s_aTypes(
-                ::getCppuType( (const Reference< XIdlReflection > *)0 ),
-                ::getCppuType( (const Reference< XHierarchicalNameAccess > *)0 ),
-                ::getCppuType( (const Reference< XServiceInfo > *)0 ),
+                cppu::UnoType<XIdlReflection>::get(),
+                cppu::UnoType<XHierarchicalNameAccess>::get(),
+                cppu::UnoType<XServiceInfo>::get(),
                 OComponentHelper::getTypes() );
             s_pTypes = &s_aTypes;
         }
@@ -263,7 +263,7 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName )
         {
             // type retrieved from tdmgr
             OSL_ASSERT( (*(Reference< XInterface > *)aRet.getValue())->queryInterface(
-                ::getCppuType( (const Reference< XTypeDescription > *)0 ) ).hasValue() );
+                cppu::UnoType<XTypeDescription>::get()).hasValue() );
 
             css::uno::Reference< css::reflection::XConstantTypeDescription >
                 ctd;
@@ -288,7 +288,7 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName )
                 if (pTD)
                 {
                     Reference< XIdlClass > xIdlClass( constructClass( pTD ) );
-                    aRet.setValue( &xIdlClass, ::getCppuType( (const Reference< XIdlClass > *)0 ) );
+                    aRet.setValue( &xIdlClass, cppu::UnoType<XIdlClass>::get());
                     typelib_typedescription_release( pTD );
                 }
             }
diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx
index 9a9e86f8530c..d55893cdc3e9 100644
--- a/stoc/source/corereflection/crenum.cxx
+++ b/stoc/source/corereflection/crenum.cxx
@@ -100,8 +100,8 @@ Sequence< Type > IdlEnumFieldImpl::getTypes()
         if (! s_pTypes)
         {
             static ::cppu::OTypeCollection s_aTypes(
-                ::getCppuType( (const Reference< XIdlField2 > *)0 ),
-                ::getCppuType( (const Reference< XIdlField > *)0 ),
+                cppu::UnoType<XIdlField2>::get(),
+                cppu::UnoType<XIdlField>::get(),
                 IdlMemberImpl::getTypes() );
             s_pTypes = &s_aTypes;
         }
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index d4f5ef03ce9a..b23fc2738fcf 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -114,8 +114,8 @@ Sequence< Type > IdlAttributeFieldImpl::getTypes()
         if (! s_pTypes)
         {
             static ::cppu::OTypeCollection s_aTypes(
-                ::getCppuType( (const Reference< XIdlField2 > *)0 ),
-                ::getCppuType( (const Reference< XIdlField > *)0 ),
+                cppu::UnoType<XIdlField2>::get(),
+                cppu::UnoType<XIdlField>::get(),
                 IdlMemberImpl::getTypes() );
             s_pTypes = &s_aTypes;
         }
@@ -409,7 +409,7 @@ Sequence< Type > IdlInterfaceMethodImpl::getTypes()
         if (! s_pTypes)
         {
             static ::cppu::OTypeCollection s_aTypes(
-                ::getCppuType( (const Reference< XIdlMethod > *)0 ),
+                cppu::UnoType<XIdlMethod>::get(),
                 IdlMemberImpl::getTypes() );
             s_pTypes = &s_aTypes;
         }
@@ -725,7 +725,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
                 &aExc.TargetException,
                 reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
             uno_type_copyAndConvertData(
-                &aExc.TargetException, pUnoExc, ::getCppuType( (const Any *)0 ).getTypeLibType(),
+                &aExc.TargetException, pUnoExc, cppu::UnoType<Any>::get().getTypeLibType(),
                 getReflection()->getUno2Cpp().get() );
             uno_any_destruct( pUnoExc, 0 );
             throw aExc;