Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I69cac41fd3db1e99ecb55e23ac81c67046f81cb4

2 files changed, 8 insertions, 8 deletions

diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index c8da6ca52ebd..f298e42c1007 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -231,7 +231,7 @@ SbPropertySetInfo::SbPropertySetInfo( const SbPropertyValueArr_Impl &rPropVals )
         const PropertyValue &rPropVal = rPropVals[n];
         rProp.Name = rPropVal.Name;
         rProp.Handle = rPropVal.Handle;
-        rProp.Type = getCppuVoidType();
+        rProp.Type = cppu::UnoType<cppu::UnoVoidType>::get();
         rProp.Attributes = 0;
     }
 }
@@ -286,7 +286,7 @@ void RTL_Impl_CreatePropertySet( StarBASIC* pBasic, SbxArray& rPar, bool bWrite
     {
         // Set PropertyValues
         Any aArgAsAny = sbxToUnoValue( rPar.Get(1),
-                getCppuType( (Sequence<PropertyValue>*)0 ) );
+                cppu::UnoType<Sequence<PropertyValue>>::get() );
         Sequence<PropertyValue> const *pArg =
                 static_cast<Sequence<PropertyValue> const *>(aArgAsAny.getValue());
         Reference< XPropertyAccess > xPropAcc = Reference< XPropertyAccess >::query( xInterface );
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 2e527d46edbd..13da041c26fe 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -375,7 +375,7 @@ Reference<XIdlClass> TypeToIdlClass( const Type& rType )
 template< class EXCEPTION >
 OUString implGetExceptionMsg( const EXCEPTION& e )
 {
-    return implGetExceptionMsg( e, ::getCppuType( &e ).getTypeName() );
+    return implGetExceptionMsg( e, cppu::UnoType<decltype(e)>::get().getTypeName() );
 }
 
 void implHandleBasicErrorException( BasicErrorException& e )
@@ -831,7 +831,7 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
 // Deliver the reflection for Sbx types
 Type getUnoTypeForSbxBaseType( SbxDataType eType )
 {
-    Type aRetType = getCppuVoidType();
+    Type aRetType = cppu::UnoType<UnoVoidType>::get();
     switch( eType )
     {
         case SbxNULL:       aRetType = cppu::UnoType<XInterface>::get(); break;
@@ -867,7 +867,7 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType )
 // Converting of Sbx to Uno without a know target class for TypeClass_ANY
 Type getUnoTypeForSbxValue( const SbxValue* pVal )
 {
-    Type aRetType = getCppuVoidType();
+    Type aRetType = cppu::UnoType<cppu::UnoVoidType>::get();
     if( !pVal )
         return aRetType;
 
@@ -1433,13 +1433,13 @@ Any sbxToUnoValue( const SbxValue* pVar, const Type& rType, Property* pUnoProper
         case TypeClass_BOOLEAN:
         {
             sal_Bool b = pVar->GetBool();
-            aRetVal.setValue( &b, getBooleanCppuType() );
+            aRetVal.setValue( &b, cppu::UnoType<bool>::get() );
             break;
         }
         case TypeClass_CHAR:
         {
             sal_Unicode c = pVar->GetChar();
-            aRetVal.setValue( &c , getCharCppuType() );
+            aRetVal.setValue( &c , cppu::UnoType<cppu::UnoCharType>::get() );
             break;
         }
         case TypeClass_STRING:          aRetVal <<= pVar->GetOUString(); break;
@@ -3057,7 +3057,7 @@ void RTL_Impl_CreateUnoServiceWithArguments( StarBASIC* pBasic, SbxArray& rPar,
     // get the name of the class of the struct
     OUString aServiceName = rPar.Get(1)->GetOUString();
     Any aArgAsAny = sbxToUnoValue( rPar.Get(2),
-                getCppuType( (Sequence<Any>*)0 ) );
+                cppu::UnoType<Sequence<Any>>::get() );
     Sequence< Any > aArgs;
     aArgAsAny >>= aArgs;