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 | a90983bd658b6f69a353ccdf0d332ed280b69711 (patch) | |
tree | af1364059594ed162c721c3cd29810567b2c8ec8 /desktop | |
parent | 01ea434011fdf868c612539179bb30aedb0495d0 (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 f0e1c69934bc..70033078921a 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 a62873d89c5f..7a93e5b42df3 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 25df7f0f4caa..efd055dc4d87 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 195cc012b404..f527941376bd 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 66e45a3f2da2..5f715393cc1c 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 5d7561b628e6..dc40670e9535 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 e01f96655e81..a2f9bd232123 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 3d3001897859..6507cdb0d7f7 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 f96103acea90..b67625d588f0 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 5eb809d11695..939e8208f57f 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 218f0536d7e2..c4de86635ae8 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 ca2b2099be63..88d6906bfdea 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, |