[Libreoffice-commits] .: binaryurp/source bridges/test cppuhelper/qa cppuhelper/test io/source io/test pyuno/source remotebridges/examples remotebridges/source sal/test stoc/source stoc/test ure/source
Matus Kukan
mkukan at kemper.freedesktop.org
Tue Jul 12 09:03:37 PDT 2011
binaryurp/source/bridgefactory.cxx | 7 -------
bridges/test/java_uno/acquire/testacquire.cxx | 8 --------
bridges/test/java_uno/equals/testequals.cxx | 6 ------
bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx | 6 ------
bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx | 6 ------
bridges/test/java_uno/nativethreadpool/version.map | 2 --
cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx | 7 -------
cppuhelper/test/cfg_test.cxx | 6 ------
io/source/TextInputStream/TextInputStream.cxx | 6 ------
io/source/TextOutputStream/TextOutputStream.cxx | 6 ------
io/source/acceptor/acceptor.cxx | 6 ------
io/source/connector/connector.cxx | 6 ------
io/source/stm/factreg.cxx | 6 ------
io/test/stm/exports.dxp | 2 --
io/test/stm/testfactreg.cxx | 7 -------
pyuno/source/loader/pyuno_loader.cxx | 7 -------
remotebridges/examples/exports.dxp | 1 -
remotebridges/examples/officeclient.cxx | 6 ------
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 6 ------
sal/test/unloading/exports.dxp | 1 -
sal/test/unloading/samplelib1.cxx | 4 ----
sal/test/unloading/samplelib2.cxx | 4 ----
stoc/source/bootstrap/services.cxx | 6 ------
stoc/source/corereflection/crefl.cxx | 6 ------
stoc/source/inspect/introspection.cxx | 7 -------
stoc/source/invocation/invocation.cxx | 6 ------
stoc/source/invocation_adapterfactory/iafactory.cxx | 7 -------
stoc/source/javaloader/javaloader.cxx | 9 ---------
stoc/source/javavm/javavm.cxx | 6 ------
stoc/source/namingservice/namingservice.cxx | 6 ------
stoc/source/proxy_factory/proxyfac.cxx | 6 ------
stoc/source/stocservices/stocservices.cxx | 6 ------
stoc/test/excomp/excomp1.cxx | 6 ------
stoc/test/excomp/excomp2.cxx | 6 ------
stoc/test/excomp/exports.dxp | 1 -
stoc/test/registry_tdprovider/testregistrytdprovider.cxx | 8 --------
stoc/test/tdmanager/testtdmanager.cxx | 8 --------
stoc/test/testsmgr_cpnt.cxx | 6 ------
stoc/test/testsmgr_cpnt.map | 1 -
ure/source/uretest/cppmain.cc | 6 ------
ure/source/uretest/cppserver.cc | 6 ------
ure/source/uretest/cpptest.cc | 6 ------
ure/source/uretest/version.map | 1 -
43 files changed, 236 deletions(-)
New commits:
commit b30fd99cd69d39e2b9290be458894fe3b9e7c896
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Jul 12 16:30:06 2011 +0200
Remove component_getImplementationEnvironment
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index ebaf3d1..9421371 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -225,11 +225,4 @@ 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: */
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index f89e9f3..f0d4507 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -510,14 +510,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/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 78f7483..8f68336 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -162,12 +162,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstance(
return static_cast< cppu::OWeakObject * >(new Service(rContext));
}
-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 *)
{
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index cab27e5..a16aebf 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -170,10 +170,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
implName, serviceManager, registryKey, entries);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 0a7f0ae..dc5745e 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -134,10 +134,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
implName, serviceManager, registryKey, entries);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/test/java_uno/nativethreadpool/version.map b/bridges/test/java_uno/nativethreadpool/version.map
index 39c961b..85cba00 100644
--- a/bridges/test/java_uno/nativethreadpool/version.map
+++ b/bridges/test/java_uno/nativethreadpool/version.map
@@ -28,8 +28,6 @@
UDK_3_0_0 {
global:
component_getFactory;
- component_getImplementationEnvironment;
-
local:
*;
};
diff --git a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
index 100c530..9f72fb1 100644
--- a/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
+++ b/cppuhelper/qa/propertysetmixin/comp_propertysetmixin.cxx
@@ -423,11 +423,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL mixin_component_getFactory(
implName, serviceManager, registryKey, entries);
}
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL mixin_component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 3779fb7..735f7ee 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -227,12 +227,6 @@ static struct ImplementationEntry g_entries[] =
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/io/source/TextInputStream/TextInputStream.cxx b/io/source/TextInputStream/TextInputStream.cxx
index 229731d..c157bc1 100644
--- a/io/source/TextInputStream/TextInputStream.cxx
+++ b/io/source/TextInputStream/TextInputStream.cxx
@@ -507,12 +507,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/io/source/TextOutputStream/TextOutputStream.cxx b/io/source/TextOutputStream/TextOutputStream.cxx
index 79a06d7..6ea4d3f 100644
--- a/io/source/TextOutputStream/TextOutputStream.cxx
+++ b/io/source/TextOutputStream/TextOutputStream.cxx
@@ -305,12 +305,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/io/source/acceptor/acceptor.cxx b/io/source/acceptor/acceptor.cxx
index 65770df..8d1c1a6 100644
--- a/io/source/acceptor/acceptor.cxx
+++ b/io/source/acceptor/acceptor.cxx
@@ -352,12 +352,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/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index 67eea93..4d86512 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -264,12 +264,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/io/source/stm/factreg.cxx b/io/source/stm/factreg.cxx
index c0513cd..283439f 100644
--- a/io/source/stm/factreg.cxx
+++ b/io/source/stm/factreg.cxx
@@ -105,12 +105,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/io/test/stm/exports.dxp b/io/test/stm/exports.dxp
index ce95ae0..8621486 100644
--- a/io/test/stm/exports.dxp
+++ b/io/test/stm/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
component_getFactory
-component_writeInfo
\ No newline at end of file
+component_writeInfo
diff --git a/io/test/stm/testfactreg.cxx b/io/test/stm/testfactreg.cxx
index d69c945..804b563 100644
--- a/io/test/stm/testfactreg.cxx
+++ b/io/test/stm/testfactreg.cxx
@@ -47,13 +47,6 @@ using namespace ::com::sun::star::lang;
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/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index b5ef002..4893a74 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -245,13 +245,6 @@ static struct cppu::ImplementationEntry g_entries[] =
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/remotebridges/examples/exports.dxp b/remotebridges/examples/exports.dxp
index 9630d7e..51703a0 100644
--- a/remotebridges/examples/exports.dxp
+++ b/remotebridges/examples/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
component_writeInfo
component_getFactory
diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx
index 9679936..9341fc4 100644
--- a/remotebridges/examples/officeclient.cxx
+++ b/remotebridges/examples/officeclient.cxx
@@ -278,12 +278,6 @@ using namespace remotebridges_officeclient;
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/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index e9af6ae..d3b2f0c 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -215,12 +215,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/sal/test/unloading/exports.dxp b/sal/test/unloading/exports.dxp
index 82adf8e..9990690 100644
--- a/sal/test/unloading/exports.dxp
+++ b/sal/test/unloading/exports.dxp
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
component_writeInfo
component_getFactory
component_canUnload
diff --git a/sal/test/unloading/samplelib1.cxx b/sal/test/unloading/samplelib1.cxx
index 5d6e1a9..a7b81a5 100644
--- a/sal/test/unloading/samplelib1.cxx
+++ b/sal/test/unloading/samplelib1.cxx
@@ -136,10 +136,6 @@ static Reference<XInterface> SAL_CALL test4_createInstance(const Reference<XMult
// Standard UNO library interface -------------------------------------------------
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) throw()
{
if (pRegistryKey)
diff --git a/sal/test/unloading/samplelib2.cxx b/sal/test/unloading/samplelib2.cxx
index 40d3768..c7a20f7 100644
--- a/sal/test/unloading/samplelib2.cxx
+++ b/sal/test/unloading/samplelib2.cxx
@@ -126,10 +126,6 @@ static Reference<XInterface> SAL_CALL test23_createInstance(const Reference<XMul
// Standard UNO library interface -------------------------------------------------
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) throw()
{
if (pRegistryKey)
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx
index f529aa6..32f7a40 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 29a4710..4d24247 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 c5ee6c4..5ada829 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 ca9731b..e5b05d0 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 c315709..f011c13 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 22452ac..b28b766 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 abe67d9..93c21e1 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 39e1528..c932695 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 cc2d4a4..84833f3 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 bd78940..0a9e96c 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 03c22f1..84c075d 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 43235ab..f9e84ea 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 9630d7e..51703a0 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 c833197..bf395f1 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 694a678..81353ae 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 22b6a00..a16c5e0 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 ab5ed35..3cfb435 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;
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index ee2ca08..816c58e 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -265,9 +265,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return ::cppu::component_getFactoryHelper(
implName, serviceManager, registryKey, entries);
}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, ::uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 68fe22e..960760c 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -117,9 +117,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return ::cppu::component_getFactoryHelper(
implName, serviceManager, registryKey, entries);
}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, ::uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index 9f2c40a..e138b8d 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -117,9 +117,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
return cppu::component_getFactoryHelper(
implName, serviceManager, registryKey, entries);
}
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
- char const ** envTypeName, uno_Environment **)
-{
- *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
diff --git a/ure/source/uretest/version.map b/ure/source/uretest/version.map
index 7d30577..4f37658 100644
--- a/ure/source/uretest/version.map
+++ b/ure/source/uretest/version.map
@@ -28,7 +28,6 @@
UDK_3_0_0 {
global:
component_getFactory;
- component_getImplementationEnvironment;
component_writeInfo;
_ZTI*;
More information about the Libreoffice-commits
mailing list