Replace remaining getCppuType et al with cppu::UnoType

Change-Id: I37d1a939c1a98f77152ed90dfb201446101f3157

2 files changed, 7 insertions, 10 deletions

diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 13b8c6b84fb5..d4b95be6b442 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -485,13 +485,11 @@ JNI_info::JNI_info(
       m_XInterface_queryInterface_td(
         (reinterpret_cast< typelib_InterfaceTypeDescription * >(
             css::uno::TypeDescription(
-                ::getCppuType(
-                    (css::uno::Reference< css::uno::XInterface > const *)0 ) )
+                cppu::UnoType<css::uno::XInterface>::get())
             .get())->ppMembers[ 0 ] ) ),
-      m_Exception_type( ::getCppuType( (css::uno::Exception const *)0 ) ),
-      m_RuntimeException_type(
-          ::getCppuType( (css::uno::RuntimeException const *)0 ) ),
-      m_void_type( ::getCppuVoidType() ),
+      m_Exception_type(cppu::UnoType<css::uno::Exception>::get()),
+      m_RuntimeException_type(cppu::UnoType<css::uno::RuntimeException>::get()),
+      m_void_type(cppu::UnoType<cppu::UnoVoidType>::get()),
       m_XInterface_type_info( 0 )
 {
     JNI_context jni( this, jni_env, class_loader ); // !no proper jni_info!
@@ -864,8 +862,7 @@ JNI_info::JNI_info(
     try
     {
         css::uno::TypeDescription XInterface_td(
-            ::getCppuType(
-                (css::uno::Reference< css::uno::XInterface > const *)0 ) );
+            cppu::UnoType<css::uno::XInterface>::get());
         // coverity [ctor_dtor_leak]
         m_XInterface_type_info =
             new JNI_interface_type_info( jni, XInterface_td.get() );
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index 88497b562652..27df64dd30f2 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -794,7 +794,7 @@ void SAL_CALL UNO_proxy_dispatch(
             buf.makeStringAndClear(),
             ::com::sun::star::uno::Reference<
               ::com::sun::star::uno::XInterface >() );
-        ::com::sun::star::uno::Type const & exc_type = ::getCppuType( &exc );
+        ::com::sun::star::uno::Type const & exc_type = cppu::UnoType<decltype(exc)>::get();
         uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0 );
         SAL_INFO("bridges", exc.Message);
     }
@@ -805,7 +805,7 @@ void SAL_CALL UNO_proxy_dispatch(
             "[jni_uno bridge error] attaching current thread to java failed!",
             ::com::sun::star::uno::Reference<
               ::com::sun::star::uno::XInterface >() );
-        ::com::sun::star::uno::Type const & exc_type = ::getCppuType( &exc );
+        ::com::sun::star::uno::Type const & exc_type = cppu::UnoType<decltype(exc)>::get();
         uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0 );
         SAL_WARN("bridges", exc.Message);
     }