diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:35:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:35:33 +0200 |
| commit | fb088cdd8d6aed2f82b13b03d8ddb6f7901c5ef2 (patch) | |
| tree | a1be19894c8574a84cd9da75648cc971fe4d2b42 /bridges/source/jni_uno/jni_info.cxx | |
| parent | Replace remaining getCppuType et al with cppu::UnoType (diff) | |
| download | core-fb088cdd8d6aed2f82b13b03d8ddb6f7901c5ef2.tar.gz core-fb088cdd8d6aed2f82b13b03d8ddb6f7901c5ef2.zip | |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I37d1a939c1a98f77152ed90dfb201446101f3157
Diffstat (limited to 'bridges/source/jni_uno/jni_info.cxx')
| -rw-r--r-- | bridges/source/jni_uno/jni_info.cxx | 13 |
1 files changed, 5 insertions, 8 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() ); |