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 /scripting | |
parent | 01ea434011fdf868c612539179bb30aedb0495d0 (diff) |
Remove component_getImplementationEnvironment methods
Diffstat (limited to 'scripting')
-rw-r--r-- | scripting/source/basprov/basprov.cxx | 8 | ||||
-rw-r--r-- | scripting/source/dlgprov/dlgprov.cxx | 8 | ||||
-rwxr-xr-x | scripting/source/protocolhandler/exports.dxp | 1 | ||||
-rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 9 | ||||
-rw-r--r-- | scripting/source/provider/MasterScriptProvider.cxx | 10 | ||||
-rwxr-xr-x | scripting/source/provider/exports.dxp | 1 | ||||
-rw-r--r-- | scripting/source/runtimemgr/ScriptRuntimeManager.cxx | 9 | ||||
-rwxr-xr-x | scripting/source/runtimemgr/exports.dxp | 1 | ||||
-rw-r--r-- | scripting/source/stringresource/stringresource.cxx | 8 | ||||
-rw-r--r-- | scripting/source/vbaevents/service.cxx | 7 | ||||
-rwxr-xr-x | scripting/util/exports.dxp | 1 |
11 files changed, 0 insertions, 63 deletions
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx index 1be60dabb72c..6759b39045a8 100644 --- a/scripting/source/basprov/basprov.cxx +++ b/scripting/source/basprov/basprov.cxx @@ -597,14 +597,6 @@ namespace basprov extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) - { - (void)ppEnv; - - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx index 39ccc33de281..425229fd8163 100644 --- a/scripting/source/dlgprov/dlgprov.cxx +++ b/scripting/source/dlgprov/dlgprov.cxx @@ -893,14 +893,6 @@ static ::rtl::OUString aResourceResolverPropName(RTL_CONSTASCII_USTRINGPARAM("Re extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) - { - (void)ppEnv; - - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/protocolhandler/exports.dxp b/scripting/source/protocolhandler/exports.dxp index f0e1c69934bc..70033078921a 100755 --- a/scripting/source/protocolhandler/exports.dxp +++ b/scripting/source/protocolhandler/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 4450228705b5..ce98253b8c44 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -508,21 +508,12 @@ const Reference< XMultiServiceFactory >& xServiceManager ) } // namespace scripting_protocolhandler -/* exported functions for registration */ extern "C" { #undef css #define css ::com::sun::star - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char** ppEnvironmentTypeName, uno_Environment** ppEnvironment ) - { - (void)ppEnvironment; - - *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; - } - SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplementationName , void * pServiceManager , void * pRegistryKey ) diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx index 28be68cb0391..6975cc4b40f8 100644 --- a/scripting/source/provider/MasterScriptProvider.cxx +++ b/scripting/source/provider/MasterScriptProvider.cxx @@ -969,18 +969,8 @@ static struct cppu::ImplementationEntry s_entries [] = //#### EXPORTED ############################################################## //############################################################################ -/** - * Gives the environment this component belongs to. - */ extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) - { - (void)ppEnv; - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - /** * This function is called to get service factories for an implementation. * diff --git a/scripting/source/provider/exports.dxp b/scripting/source/provider/exports.dxp index f0e1c69934bc..70033078921a 100755 --- a/scripting/source/provider/exports.dxp +++ b/scripting/source/provider/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory diff --git a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx index ce05625d19dd..f2b8b13399bc 100644 --- a/scripting/source/runtimemgr/ScriptRuntimeManager.cxx +++ b/scripting/source/runtimemgr/ScriptRuntimeManager.cxx @@ -455,17 +455,8 @@ static struct cppu::ImplementationEntry s_entries [] = //#### EXPORTED ######################################################################### //####################################################################################### -/** - * Gives the environment this component belongs to. - */ extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, - uno_Environment ** ppEnv ) - { - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - /** * This function is called to get service factories for an implementation. * diff --git a/scripting/source/runtimemgr/exports.dxp b/scripting/source/runtimemgr/exports.dxp index f0e1c69934bc..70033078921a 100755 --- a/scripting/source/runtimemgr/exports.dxp +++ b/scripting/source/runtimemgr/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 48f4625a8bc7..73fcc8042f28 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -3071,14 +3071,6 @@ static struct ::cppu::ImplementationEntry s_component_entries [] = extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) - { - (void)ppEnv; - - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx index b77c35013be7..4dca197aad3d 100644 --- a/scripting/source/vbaevents/service.cxx +++ b/scripting/source/vbaevents/service.cxx @@ -101,13 +101,6 @@ namespace ooevtdescgen extern "C" { - SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ) - { - OSL_TRACE("In component_getImplementationEnv"); - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, registry::XRegistryKey * pRegistryKey ) diff --git a/scripting/util/exports.dxp b/scripting/util/exports.dxp index f0e1c69934bc..70033078921a 100755 --- a/scripting/util/exports.dxp +++ b/scripting/util/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory |