From fa2a7c1c95f78d20ed572091e12700fd4d852835 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 17 Dec 2013 10:53:29 +0100 Subject: Keep using component_getImplementationEnvironment in extensions ...instead of relying on the implicit CPPU_CURRENT_LANGUAGE_BINDING_NAME convention. Keeping that convention an implementation detail makes it easier to do improvements in the future. (Theoretically, the bundled extension in mysqlc could be considered internal code and not adapted, but just be safe.) Change-Id: Iae41a6e072dabc2bf7c1481ba6cfed61680edf37 --- desktop/test/deployment/active/active_native.cxx | 8 ++++++++ desktop/test/deployment/passive/passive_native.cxx | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'desktop/test') diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 9591c9d530a1..eba34dbaf11d 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -54,6 +54,7 @@ #include "rtl/ustring.hxx" #include "sal/log.hxx" #include "sal/types.h" +#include "uno/lbnames.h" namespace { @@ -251,6 +252,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( + char const ** ppEnvTypeName, uno_Environment **) +{ + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; +} + extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey) { diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index b4f78870752d..8714690ff0d9 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -51,6 +51,7 @@ #include "cppuhelper/weak.hxx" #include "rtl/ustring.hxx" #include "sal/types.h" +#include "uno/lbnames.h" namespace { @@ -248,4 +249,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( + char const ** ppEnvTypeName, uno_Environment **) +{ + *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit