diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-17 10:53:29 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-18 15:52:23 +0000 |
| commit | 8071d87b62ab87b2a825394847e9313ea8ddfcb4 (patch) | |
| tree | 63909a7e4e7bd09e831f11ad06df8d29a945d385 /desktop | |
| parent | 4d678d76b51a14e81b0a29c7e96a338bd058526a (diff) | |
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.)
(cherry picked from commit fa2a7c1c95f78d20ed572091e12700fd4d852835)
Conflicts:
desktop/test/deployment/active/active_native.cxx
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
odk/examples/cpp/counter/counter.cxx
Change-Id: Iae41a6e072dabc2bf7c1481ba6cfed61680edf37
Reviewed-on: https://gerrit.libreoffice.org/7119
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/test/deployment/active/active_native.cxx | 7 | ||||
| -rw-r--r-- | desktop/test/deployment/passive/passive_native.cxx | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 3afc099dd156..0e0b1e6f2496 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -252,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_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 819f6ab0ef59..22586a450326 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -249,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: */ |