Kaydet (Commit) 916f88f0 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Replace remaining getCppuType et al with cppu::UnoType

Change-Id: Iadbbc005ee8bdbf3f33fd291deef376c8adab806
üst 79451a05
...@@ -62,7 +62,7 @@ inline ::System::Object ^ to_cli( ...@@ -62,7 +62,7 @@ inline ::System::Object ^ to_cli(
intptr_t intptr = intptr_t intptr =
reinterpret_cast< intptr_t >( 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::Runtime::InteropServices::GCHandle ^ handle = ::System::Runtime::InteropServices::GCHandle::FromIntPtr(::System::IntPtr(intptr));
::System::Object ^ ret = handle->Target; ::System::Object ^ ret = handle->Target;
handle->Free(); handle->Free();
...@@ -100,7 +100,7 @@ inline void to_uno( ...@@ -100,7 +100,7 @@ inline void to_uno(
ERROR: either _WIN64 or _WIN32 must be defined ERROR: either _WIN64 or _WIN32 must be defined
#endif #endif
), ),
::getCppuType( pRet ) ); cppu::UnoType<T>::get() );
handle.Free(); handle.Free();
pRet->set( ret, SAL_NO_ACQUIRE /* takeover ownership */ ); pRet->set( ret, SAL_NO_ACQUIRE /* takeover ownership */ );
} }
......
...@@ -524,7 +524,7 @@ srrm::IMessage^ UnoInterfaceProxy::Invoke(srrm::IMessage^ callmsg) ...@@ -524,7 +524,7 @@ srrm::IMessage^ UnoInterfaceProxy::Invoke(srrm::IMessage^ callmsg)
System::Object^ pExc = nullptr; System::Object^ pExc = nullptr;
m_bridge->call_uno( m_bridge->call_uno(
info->m_unoI, member_td.get(), info->m_unoI, member_td.get(),
::getCppuVoidType().getTypeLibType(), cppu::UnoType<cppu::UnoVoidType>::get().getTypeLibType(),
1, &param, args, nullptr, &pExc); 1, &param, args, nullptr, &pExc);
return constructReturnMessage(nullptr, nullptr, NULL, return constructReturnMessage(nullptr, nullptr, NULL,
callmsg, pExc); callmsg, pExc);
...@@ -1098,7 +1098,7 @@ void SAL_CALL cli_proxy_dispatch( ...@@ -1098,7 +1098,7 @@ void SAL_CALL cli_proxy_dispatch(
"[cli_uno bridge error] " + err.m_message, "[cli_uno bridge error] " + err.m_message,
css::uno::Reference< css::uno::Reference<
css::uno::XInterface >() ); 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); uno_type_any_construct( *uno_exc, &exc, exc_type.getTypeLibType(), 0);
#if OSL_DEBUG_LEVEL >= 1 #if OSL_DEBUG_LEVEL >= 1
OString cstr_msg(OUStringToOString(exc.Message, OString cstr_msg(OUStringToOString(exc.Message,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment