diff options
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/bootstrap/services.cxx | 6 | ||||
-rw-r--r-- | stoc/source/corereflection/crefl.cxx | 6 | ||||
-rw-r--r-- | stoc/source/inspect/introspection.cxx | 7 | ||||
-rw-r--r-- | stoc/source/invocation/invocation.cxx | 6 | ||||
-rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 7 | ||||
-rw-r--r-- | stoc/source/javaloader/javaloader.cxx | 9 | ||||
-rw-r--r-- | stoc/source/javavm/javavm.cxx | 6 | ||||
-rw-r--r-- | stoc/source/namingservice/namingservice.cxx | 6 | ||||
-rw-r--r-- | stoc/source/proxy_factory/proxyfac.cxx | 6 | ||||
-rw-r--r-- | stoc/source/stocservices/stocservices.cxx | 6 | ||||
-rw-r--r-- | stoc/test/excomp/excomp1.cxx | 6 | ||||
-rw-r--r-- | stoc/test/excomp/excomp2.cxx | 6 | ||||
-rw-r--r-- | stoc/test/excomp/exports.dxp | 1 | ||||
-rw-r--r-- | stoc/test/registry_tdprovider/testregistrytdprovider.cxx | 8 | ||||
-rw-r--r-- | stoc/test/tdmanager/testtdmanager.cxx | 8 | ||||
-rw-r--r-- | stoc/test/testsmgr_cpnt.cxx | 6 | ||||
-rw-r--r-- | stoc/test/testsmgr_cpnt.map | 1 |
17 files changed, 0 insertions, 101 deletions
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx index f529aa6bf..32f7a401b 100644 --- a/stoc/source/bootstrap/services.cxx +++ b/stoc/source/bootstrap/services.cxx @@ -126,12 +126,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -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/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 29a471034..4d242471f 100644 --- a/stoc/source/corereflection/crefl.cxx +++ b/stoc/source/corereflection/crefl.cxx @@ -481,12 +481,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -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/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index c5ee6c41c..5ada829be 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -3044,13 +3044,6 @@ Reference< XInterface > SAL_CALL ImplIntrospection_CreateInstance( const Referen 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 * ) { diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index ca9731b75..e5b05d09c 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -1222,12 +1222,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -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/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index c315709d1..f011c137a 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -991,13 +991,6 @@ sal_Bool SAL_CALL component_canUnload( } //============================================================================== -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/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 22452aca1..b28b766d5 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -445,15 +445,6 @@ static struct ImplementationEntry g_entries[] = extern "C" { -// NOTE: component_canUnload is not exported, as the library cannot be unloaded. - -//================================================================================================== -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/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index abe67d934..93c21e174 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -609,12 +609,6 @@ private: } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(sal_Char const ** pEnvTypeName, - uno_Environment **) -{ - *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName, void * pServiceManager, void * pRegistryKey) diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 39e1528ed..c93269578 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -213,12 +213,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -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/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index cc2d4a488..84833f379 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -521,12 +521,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue * pTime ) return g_moduleCount.canUnload( &g_moduleCount, pTime ); } -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/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx index bd7894036..0a9e96c71 100644 --- a/stoc/source/stocservices/stocservices.cxx +++ b/stoc/source/stocservices/stocservices.cxx @@ -96,12 +96,6 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) } //================================================================================================== -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/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx index 03c22f136..84c075d41 100644 --- a/stoc/test/excomp/excomp1.cxx +++ b/stoc/test/excomp/excomp1.cxx @@ -155,12 +155,6 @@ Reference<XInterface> SAL_CALL ExampleComponent1_CreateInstance( const Reference extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== sal_Bool SAL_CALL component_writeInfo( void * /* pServiceManager */ , void * pRegistryKey ) { diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx index 43235ab67..f9e84eaa9 100644 --- a/stoc/test/excomp/excomp2.cxx +++ b/stoc/test/excomp/excomp2.cxx @@ -226,12 +226,6 @@ Reference<XInterface> SAL_CALL ExampleComponent2_CreateInstance( const Reference extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== sal_Bool SAL_CALL component_writeInfo( void * /* pServiceManager */, void * pRegistryKey ) { diff --git a/stoc/test/excomp/exports.dxp b/stoc/test/excomp/exports.dxp index 9630d7e06..51703a046 100644 --- a/stoc/test/excomp/exports.dxp +++ b/stoc/test/excomp/exports.dxp @@ -1,3 +1,2 @@ -component_getImplementationEnvironment component_writeInfo component_getFactory diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx index c833197d2..bf395f1e7 100644 --- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx +++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx @@ -882,14 +882,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance( return static_cast< cppu::OWeakObject * >(new Service(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - if (envTypeName != 0) { - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } -} - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName, void * serviceManager, void *) { void * p = 0; diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx index 694a678df..81353ae5c 100644 --- a/stoc/test/tdmanager/testtdmanager.cxx +++ b/stoc/test/tdmanager/testtdmanager.cxx @@ -313,14 +313,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance( return static_cast< cppu::OWeakObject * >(new Service(context)); } -extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - char const ** envTypeName, uno_Environment **) -{ - if (envTypeName != 0) { - *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; - } -} - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const * implName, void * serviceManager, void *) { void * p = 0; diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx index 22b6a000e..a16c5e016 100644 --- a/stoc/test/testsmgr_cpnt.cxx +++ b/stoc/test/testsmgr_cpnt.cxx @@ -292,12 +292,6 @@ extern "C" void SAL_CALL test_ServiceManager() extern "C" { //================================================================================================== -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} -//================================================================================================== sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey ) { diff --git a/stoc/test/testsmgr_cpnt.map b/stoc/test/testsmgr_cpnt.map index ab5ed357b..3cfb43578 100644 --- a/stoc/test/testsmgr_cpnt.map +++ b/stoc/test/testsmgr_cpnt.map @@ -1,6 +1,5 @@ UDK_3_0_0 { global: - component_getImplementationEnvironment; component_writeInfo; component_getFactory; test_ServiceManager; |