diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-12 17:53:48 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-12 17:59:13 +0200 |
commit | 4bbe054ed31c394056841a6de0eb6ddec6567a80 (patch) | |
tree | eaedb4a02ae77202954dc48f08144fd34e550630 /desktop | |
parent | 1f0d86f32f4f50c3c86252727cf2e16417de804a (diff) |
Remove component_getImplementationEnvironment methods
Diffstat (limited to 'desktop')
-rwxr-xr-x | desktop/source/app/exports.dxp | 1 | ||||
-rw-r--r-- | desktop/source/deployment/dp_services.cxx | 6 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_service.cxx | 6 | ||||
-rw-r--r-- | desktop/source/migration/services/cexports.cxx | 6 | ||||
-rw-r--r-- | desktop/source/migration/services/cexportsoo3.cxx | 6 | ||||
-rw-r--r-- | desktop/source/offacc/acceptor.cxx | 5 | ||||
-rw-r--r-- | desktop/source/splash/services_spl.cxx | 7 | ||||
-rw-r--r-- | desktop/test/deployment/active/active_native.cxx | 6 | ||||
-rw-r--r-- | desktop/test/deployment/boxt/boxt.cxx | 6 | ||||
-rw-r--r-- | desktop/test/deployment/passive/passive_native.cxx | 6 | ||||
-rwxr-xr-x | desktop/unx/splash/exports.map | 1 | ||||
-rw-r--r-- | desktop/unx/splash/unxsplash.cxx | 4 |
12 files changed, 0 insertions, 60 deletions
diff --git a/desktop/source/app/exports.dxp b/desktop/source/app/exports.dxp index f0e1c69934..7003307892 100755 --- a/desktop/source/app/exports.dxp +++ b/desktop/source/app/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory diff --git a/desktop/source/deployment/dp_services.cxx b/desktop/source/deployment/dp_services.cxx index 07ee2e6716..bfb4e1e23a 100644 --- a/desktop/source/deployment/dp_services.cxx +++ b/desktop/source/deployment/dp_services.cxx @@ -85,12 +85,6 @@ bool singleton_entries( uno::Reference<registry::XRegistryKey> const& ); extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index d87cbb95de..e621b848c3 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -351,12 +351,6 @@ sdecl::ServiceDecl const updateDecl( extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( sal_Char const * pImplName, lang::XMultiServiceFactory * pServiceManager, diff --git a/desktop/source/migration/services/cexports.cxx b/desktop/source/migration/services/cexports.cxx index 6c3cb01004..c772a2f9ce 100644 --- a/desktop/source/migration/services/cexports.cxx +++ b/desktop/source/migration/services/cexports.cxx @@ -61,12 +61,6 @@ extern "C" }; -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/desktop/source/migration/services/cexportsoo3.cxx b/desktop/source/migration/services/cexportsoo3.cxx index 16f1082292..7aeac35452 100644 --- a/desktop/source/migration/services/cexportsoo3.cxx +++ b/desktop/source/migration/services/cexportsoo3.cxx @@ -46,12 +46,6 @@ extern "C" }; -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 7d2da079a7..5176fb2cc7 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -297,11 +297,6 @@ extern "C" { using namespace desktop; -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment **) -{ - *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void *) { void* pReturn = NULL ; diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index e01f96655e..a2f9bd2321 100644 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.cxx @@ -84,13 +84,6 @@ getSupportedServiceNames(int p) { extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char** ppEnvironmentTypeName, - uno_Environment**) -{ - *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; -} - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 3d30018978..6507cdb0d7 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -284,12 +284,6 @@ 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/boxt/boxt.cxx b/desktop/test/deployment/boxt/boxt.cxx index f96103acea..b67625d588 100644 --- a/desktop/test/deployment/boxt/boxt.cxx +++ b/desktop/test/deployment/boxt/boxt.cxx @@ -175,12 +175,6 @@ 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 5eb809d116..939e8208f5 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -281,9 +281,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( return cppu::component_getFactoryHelper( 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; -} diff --git a/desktop/unx/splash/exports.map b/desktop/unx/splash/exports.map index 218f0536d7..c4de86635a 100755 --- a/desktop/unx/splash/exports.map +++ b/desktop/unx/splash/exports.map @@ -1,7 +1,6 @@ UDK_3_0_0 { global: GetVersionInfo; - component_getImplementationEnvironment; component_getFactory; local: diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx index ca2b2099be..88d6906bfd 100644 --- a/desktop/unx/splash/unxsplash.cxx +++ b/desktop/unx/splash/unxsplash.cxx @@ -182,10 +182,6 @@ uno::Sequence< OUString > SAL_CALL UnxSplash_getSupportedServiceNames() throw() extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, - uno_Environment ** ) -{ *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, |