diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:35:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:35:48 +0200 |
| commit | 916f88f085cf3d0e0cc8366748f38fd7585dcdd3 (patch) | |
| tree | d9488ed8d9a4c0b172c3b33e17a4571b4935dd89 /cli_ure | |
| parent | 79451a0566e95ba10c749e913cb642cd71d95755 (diff) | |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: Iadbbc005ee8bdbf3f33fd291deef376c8adab806
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/native/native_share.h | 4 | ||||
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_proxy.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h index 7e1966e0a0d9..9b3ebe1ac9b9 100644 --- a/cli_ure/source/native/native_share.h +++ b/cli_ure/source/native/native_share.h @@ -62,7 +62,7 @@ inline ::System::Object ^ to_cli( intptr_t intptr = reinterpret_cast< intptr_t >( - mapping.mapInterface( x.get(), ::getCppuType( &x ) ) ); + mapping.mapInterface( x.get(), cppu::UnoType<decltype(x)>::get() ) ); ::System::Runtime::InteropServices::GCHandle ^ handle = ::System::Runtime::InteropServices::GCHandle::FromIntPtr(::System::IntPtr(intptr)); ::System::Object ^ ret = handle->Target; handle->Free(); @@ -100,7 +100,7 @@ inline void to_uno( ERROR: either _WIN64 or _WIN32 must be defined #endif ), - ::getCppuType( pRet ) ); + cppu::UnoType<T>::get() ); handle.Free(); pRet->set( ret, SAL_NO_ACQUIRE /* takeover ownership */ ); } diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 85489b3a1f2c..06bd195dae2b 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -524,7 +524,7 @@ srrm::IMessage^ UnoInterfaceProxy::Invoke(srrm::IMessage^ callmsg) System::Object^ pExc = nullptr; m_bridge->call_uno( info->m_unoI, member_td.get(), - ::getCppuVoidType().getTypeLibType(), + cppu::UnoType<cppu::UnoVoidType>::get().getTypeLibType(), 1, ¶m, args, nullptr, &pExc); return constructReturnMessage(nullptr, nullptr, NULL, callmsg, pExc); @@ -1098,7 +1098,7 @@ void SAL_CALL cli_proxy_dispatch( "[cli_uno bridge error] " + err.m_message, css::uno::Reference< css::uno::XInterface >() ); - css::uno::Type const & exc_type = ::getCppuType( & exc); + css::uno::Type const & exc_type = cppu::UnoType<decltype(exc)>::get(); uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0); #if OSL_DEBUG_LEVEL >= 1 OString cstr_msg(OUStringToOString(exc.Message, |