diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:38:16 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 08:38:16 +0200 |
commit | ead3062336673c449a70ff41895a5cd5e087883f (patch) | |
tree | febff3626561455fe5a0c52cf5c0a2922626d11a /cppuhelper/source/component_context.cxx | |
parent | bfcdcdb63a9f7800629e3143b52f4eed1b7b0b4f (diff) |
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: I620bf5d46c19f0182e822265eadf8eb11001855e
Diffstat (limited to 'cppuhelper/source/component_context.cxx')
-rw-r--r-- | cppuhelper/source/component_context.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index ef684e93bb36..cdb7c793bdfc 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -494,7 +494,7 @@ sal_Bool ComponentContext::hasByName( OUString const & name ) Type ComponentContext::getElementType() throw (RuntimeException, std::exception) { - return ::getVoidCppuType(); + return cppu::UnoType<cppu::UnoVoidType>::get(); } @@ -850,7 +850,7 @@ extern "C" { static void s_createComponentContext_v(va_list * pParam) xContext = xDelegate; } - *ppContext = pTarget2curr->mapInterface(xContext.get(), ::getCppuType(&xContext)); + *ppContext = pTarget2curr->mapInterface(xContext.get(), cppu::UnoType<decltype(xContext)>::get()); }} Reference< XComponentContext > SAL_CALL createComponentContext( @@ -875,7 +875,7 @@ Reference< XComponentContext > SAL_CALL createComponentContext( curr2source.get()); } - void * mapped_delegate = curr2source.mapInterface(xDelegate.get(), ::getCppuType(&xDelegate)); + void * mapped_delegate = curr2source.mapInterface(xDelegate.get(), cppu::UnoType<decltype(xDelegate)>::get()); XComponentContext * pXComponentContext = NULL; source_env.invoke(s_createComponentContext_v, mapped_entries.get(), nEntries, mapped_delegate, &pXComponentContext, &source2curr); mapped_entries.reset(); |