[Libreoffice-commits] .: avmedia/source configmgr/source connectivity/source desktop/source desktop/test desktop/unx editeng/util embeddedobj/source embeddedobj/test embeddedobj/util eventattacher/source fileaccess/source formula/source fpicker/source fpicker/util framework/inc framework/source linguistic/source linguistic/workben scripting/source scripting/util sfx2/source sfx2/workben shell/source svx/source svx/util sysui/util ucb/source uui/source vbahelper/source xmlhelp/source xmloff/source xmlscript/source

[Matus Kukan]

 avmedia/source/framework/soundhandler.cxx                         |   13 -------
 avmedia/source/gstreamer/exports.dxp                              |    1 
 avmedia/source/gstreamer/gstuno.cxx                               |    5 --
 avmedia/source/quicktime/quicktimeuno.cxx                         |   13 -------
 avmedia/source/win/exports.dxp                                    |    2 -
 avmedia/source/win/winuno.cxx                                     |   13 -------
 configmgr/source/services.cxx                                     |    6 ---
 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx    |    6 ---
 connectivity/source/cpool/Zregistration.cxx                       |    6 ---
 connectivity/source/cpool/exports.dxp                             |    1 
 connectivity/source/dbtools/exports.dxp                           |    1 
 connectivity/source/drivers/adabas/Bservices.cxx                  |    9 -----
 connectivity/source/drivers/adabas/adabas.mxp.map                 |    1 
 connectivity/source/drivers/adabas/exports.dxp                    |    1 
 connectivity/source/drivers/ado/Aservices.cxx                     |    9 -----
 connectivity/source/drivers/ado/exports.dxp                       |    1 
 connectivity/source/drivers/calc/Cservices.cxx                    |    9 -----
 connectivity/source/drivers/calc/exports.dxp                      |    1 
 connectivity/source/drivers/dbase/Dservices.cxx                   |    9 -----
 connectivity/source/drivers/dbase/dbase.mxp.map                   |    1 
 connectivity/source/drivers/dbase/exports.dxp                     |    1 
 connectivity/source/drivers/evoab/LServices.cxx                   |    9 -----
 connectivity/source/drivers/evoab/exports.dxp                     |    1 
 connectivity/source/drivers/evoab2/NServices.cxx                  |    9 -----
 connectivity/source/drivers/flat/Eservices.cxx                    |    9 -----
 connectivity/source/drivers/flat/exports.dxp                      |    1 
 connectivity/source/drivers/flat/flat.mxp.map                     |    1 
 connectivity/source/drivers/hsqldb/Hservices.cxx                  |    9 -----
 connectivity/source/drivers/hsqldb/exports.dxp                    |    1 
 connectivity/source/drivers/hsqldb/hsqldb.map                     |    1 
 connectivity/source/drivers/jdbc/exports.dxp                      |    1 
 connectivity/source/drivers/jdbc/jdbc.mxp.map                     |    1 
 connectivity/source/drivers/jdbc/jservices.cxx                    |   10 -----
 connectivity/source/drivers/kab/KServices.cxx                     |   10 -----
 connectivity/source/drivers/kab/exports.dxp                       |    1 
 connectivity/source/drivers/macab/MacabServices.cxx               |   10 -----
 connectivity/source/drivers/macab/exports.dxp                     |    1 
 connectivity/source/drivers/mozab/MServices.cxx                   |    9 -----
 connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx |    8 ----
 connectivity/source/drivers/mozab/exports.dxp                     |    1 
 connectivity/source/drivers/mysql/Yservices.cxx                   |   10 -----
 connectivity/source/drivers/mysql/exports.dxp                     |    1 
 connectivity/source/drivers/odbc/oservices.cxx                    |   10 -----
 connectivity/source/manager/exports.dxp                           |    1 
 connectivity/source/manager/mregistration.cxx                     |    6 ---
 connectivity/source/manager/sdbc.mxp.map                          |    1 
 desktop/source/app/exports.dxp                                    |    1 
 desktop/source/deployment/dp_services.cxx                         |    6 ---
 desktop/source/deployment/gui/dp_gui_service.cxx                  |    6 ---
 desktop/source/migration/services/cexports.cxx                    |    6 ---
 desktop/source/migration/services/cexportsoo3.cxx                 |    6 ---
 desktop/source/offacc/acceptor.cxx                                |    5 --
 desktop/source/splash/services_spl.cxx                            |    7 ---
 desktop/test/deployment/active/active_native.cxx                  |    6 ---
 desktop/test/deployment/boxt/boxt.cxx                             |    6 ---
 desktop/test/deployment/passive/passive_native.cxx                |    6 ---
 desktop/unx/splash/exports.map                                    |    1 
 desktop/unx/splash/unxsplash.cxx                                  |    4 --
 editeng/util/editeng.dxp                                          |    1 
 embeddedobj/source/commonembedding/register.cxx                   |    5 --
 embeddedobj/source/msole/exports.dxp                              |    1 
 embeddedobj/source/msole/oleregister.cxx                          |    5 --
 embeddedobj/test/MainThreadExecutor/exports.dxp                   |    1 
 embeddedobj/test/MainThreadExecutor/register.cxx                  |    5 --
 embeddedobj/test/mtexecutor/exports.dxp                           |    1 
 embeddedobj/test/mtexecutor/mteregister.cxx                       |    5 --
 embeddedobj/util/exports.dxp                                      |    1 
 eventattacher/source/eventattacher.cxx                            |    7 ---
 fileaccess/source/FileAccess.cxx                                  |    7 ---
 formula/source/core/api/services.cxx                              |    7 ---
 fpicker/source/aqua/FPentry.cxx                                   |   18 ----------
 fpicker/source/generic/fpicker.cxx                                |    6 ---
 fpicker/source/odma/exports.map                                   |    1 
 fpicker/source/odma/fps_odma.cxx                                  |    6 ---
 fpicker/source/office/fps_office.cxx                              |    6 ---
 fpicker/source/unx/gnome/FPentry.cxx                              |   18 ----------
 fpicker/source/unx/kde4/KDE4FPEntry.cxx                           |    6 ---
 fpicker/source/unx/kde_unx/UnxFPentry.cxx                         |   17 ---------
 fpicker/source/win32/filepicker/FPentry.cxx                       |   18 ----------
 fpicker/source/win32/folderpicker/Fopentry.cxx                    |   14 -------
 fpicker/util/exports.dxp                                          |    1 
 framework/inc/macros/registration.hxx                             |   12 ------
 framework/source/lomenubar/exports.cxx                            |    6 ---
 framework/source/register/register3rdcomponents.cxx               |    4 --
 framework/source/register/registerlogindialog.cxx                 |    4 --
 framework/source/register/registerservices.cxx                    |    4 --
 framework/source/register/registertemp.cxx                        |    4 --
 linguistic/source/lngreg.cxx                                      |    8 ----
 linguistic/source/makefile.mk                                     |    1 
 linguistic/workben/exports.dxp                                    |    1 
 linguistic/workben/sreg.cxx                                       |    6 ---
 scripting/source/basprov/basprov.cxx                              |    8 ----
 scripting/source/dlgprov/dlgprov.cxx                              |    8 ----
 scripting/source/protocolhandler/exports.dxp                      |    1 
 scripting/source/protocolhandler/scripthandler.cxx                |    9 -----
 scripting/source/provider/MasterScriptProvider.cxx                |   10 -----
 scripting/source/provider/exports.dxp                             |    1 
 scripting/source/runtimemgr/ScriptRuntimeManager.cxx              |    9 -----
 scripting/source/runtimemgr/exports.dxp                           |    1 
 scripting/source/stringresource/stringresource.cxx                |    8 ----
 scripting/source/vbaevents/service.cxx                            |    7 ---
 scripting/util/exports.dxp                                        |    1 
 sfx2/source/appl/appuno.cxx                                       |    7 ---
 sfx2/workben/custompanel/ctp_services.cxx                         |    6 ---
 shell/source/backends/desktopbe/desktopbackend.cxx                |    7 ---
 shell/source/backends/gconfbe/gconfbackend.cxx                    |    7 ---
 shell/source/backends/kde4be/kde4backend.cxx                      |    7 ---
 shell/source/backends/kdebe/kdebackend.cxx                        |    7 ---
 shell/source/backends/localebe/localebecdef.cxx                   |    8 ----
 shell/source/backends/macbe/macbecdef.cxx                         |    8 ----
 shell/source/backends/wininetbe/wininetbecdef.cxx                 |    8 ----
 shell/source/cmdmail/cmdmailentry.cxx                             |   15 --------
 shell/source/cmdmail/exports.dxp                                  |    1 
 shell/source/unix/exec/shellexecentry.cxx                         |   15 --------
 shell/source/win32/SysShentry.cxx                                 |   15 --------
 shell/source/win32/exports.dxp                                    |    1 
 shell/source/win32/simplemail/exports.dxp                         |    1 
 shell/source/win32/simplemail/smplmailentry.cxx                   |   15 --------
 svx/source/core/coreservices.cxx                                  |    6 ---
 svx/source/unodialogs/textconversiondlgs/services.cxx             |    6 ---
 svx/source/unodraw/unoctabl.cxx                                   |    6 ---
 svx/util/svx.dxp                                                  |    1 
 sysui/util/exports.dxp                                            |    1 
 ucb/source/cacher/cacheserv.cxx                                   |    7 ---
 ucb/source/core/exports2.dxp                                      |    1 
 ucb/source/core/ucbserv.cxx                                       |    7 ---
 ucb/source/sorter/sortmain.cxx                                    |    7 ---
 ucb/source/ucp/expand/ucpexpand.cxx                               |    6 ---
 ucb/source/ucp/ext/ucpext_services.cxx                            |    6 ---
 ucb/source/ucp/file/exports2.dxp                                  |    1 
 ucb/source/ucp/file/prov.cxx                                      |    7 ---
 ucb/source/ucp/ftp/ftpservices.cxx                                |    7 ---
 ucb/source/ucp/gio/gio_provider.cxx                               |    6 ---
 ucb/source/ucp/gvfs/gvfs_provider.cxx                             |    6 ---
 ucb/source/ucp/hierarchy/hierarchyservices.cxx                    |    7 ---
 ucb/source/ucp/odma/odma_services.cxx                             |    7 ---
 ucb/source/ucp/package/pkgservices.cxx                            |    7 ---
 ucb/source/ucp/tdoc/tdoc_services.cxx                             |    7 ---
 ucb/source/ucp/webdav/webdavservices.cxx                          |    7 ---
 uui/source/services.cxx                                           |   17 ---------
 vbahelper/source/msforms/service.cxx                              |    7 ---
 xmlhelp/source/cxxhelp/provider/services.cxx                      |    7 ---
 xmlhelp/source/treeview/tvfactory.cxx                             |    9 -----
 xmloff/source/core/facreg.cxx                                     |    5 --
 xmloff/source/transform/XMLFilterRegistration.cxx                 |    5 --
 xmlscript/source/misc/unoservices.cxx                             |    8 ----
 146 files changed, 863 deletions(-)

New commits:
commit 4bbe054ed31c394056841a6de0eb6ddec6567a80
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Jul 12 17:53:48 2011 +0200

    Remove component_getImplementationEnvironment methods

diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 690dd8c..4c31d39 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -484,19 +484,6 @@ IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG )
 
 } // namespace framework
 
-// ------------------------------------------
-// - component_getImplementationEnvironment -
-// ------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-       *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-// ------------------------
-// - component_getFactory -
-// ------------------------
-
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     void* pReturn = NULL;
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
index f0e1c69..7003307 100755
--- a/avmedia/source/gstreamer/exports.dxp
+++ b/avmedia/source/gstreamer/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index b822f15..ea30724 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -39,11 +39,6 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
     return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
diff --git a/avmedia/source/quicktime/quicktimeuno.cxx b/avmedia/source/quicktime/quicktimeuno.cxx
index 30b6a48..3efdeee 100644
--- a/avmedia/source/quicktime/quicktimeuno.cxx
+++ b/avmedia/source/quicktime/quicktimeuno.cxx
@@ -40,19 +40,6 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
     return uno::Reference< uno::XInterface >( *new ::avmedia::quicktime::Manager( rxFact ) );
 }
 
-// ------------------------------------------
-// - component_getImplementationEnvironment -
-// ------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-// ------------------------
-// - component_getFactory -
-// ------------------------
-
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp
index 926e49f..7003307 100755
--- a/avmedia/source/win/exports.dxp
+++ b/avmedia/source/win/exports.dxp
@@ -1,3 +1 @@
-component_getImplementationEnvironment
 component_getFactory
-
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index 744bf6b..189bcae 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -40,19 +40,6 @@ static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno:
     return uno::Reference< uno::XInterface >( *new ::avmedia::win::Manager( rxFact ) );
 }
 
-// ------------------------------------------
-// - component_getImplementationEnvironment -
-// ------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-// ------------------------
-// - component_getFactory -
-// ------------------------
-
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
 {
     uno::Reference< lang::XSingleServiceFactory > xFactory;
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index ce4b9d4..5f70c6e 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -83,10 +83,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/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index e662b2b..a569f7e 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -895,12 +895,6 @@ extern "C"
 {
 
 //---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
-{
-    *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey)
 {
     return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 906089c..169669a 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -45,12 +45,6 @@ extern "C"
 {
 
 //---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
-{
-    *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
diff --git a/connectivity/source/cpool/exports.dxp b/connectivity/source/cpool/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/cpool/exports.dxp
+++ b/connectivity/source/cpool/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/dbtools/exports.dxp b/connectivity/source/dbtools/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/dbtools/exports.dxp
+++ b/connectivity/source/dbtools/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index 5402df4..dcb8098 100644
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.cxx
@@ -86,15 +86,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/adabas/adabas.mxp.map b/connectivity/source/drivers/adabas/adabas.mxp.map
index f64c44c..d1251e3 100755
--- a/connectivity/source/drivers/adabas/adabas.mxp.map
+++ b/connectivity/source/drivers/adabas/adabas.mxp.map
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/adabas/exports.dxp b/connectivity/source/drivers/adabas/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/adabas/exports.dxp
+++ b/connectivity/source/drivers/adabas/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 767c545..f259845 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -86,15 +86,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine";
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/ado/exports.dxp b/connectivity/source/drivers/ado/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/ado/exports.dxp
+++ b/connectivity/source/drivers/ado/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 411c521..41ab7f6 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -86,15 +86,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/calc/exports.dxp b/connectivity/source/drivers/calc/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/calc/exports.dxp
+++ b/connectivity/source/drivers/calc/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 889da0d..7bcc49e 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -86,15 +86,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/dbase/dbase.mxp.map b/connectivity/source/drivers/dbase/dbase.mxp.map
index 87eccc4..57a9142 100755
--- a/connectivity/source/drivers/dbase/dbase.mxp.map
+++ b/connectivity/source/drivers/dbase/dbase.mxp.map
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/dbase/exports.dxp b/connectivity/source/drivers/dbase/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/dbase/exports.dxp
+++ b/connectivity/source/drivers/dbase/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index 6620221..00c41fe 100644
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -86,15 +86,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/evoab/exports.dxp
+++ b/connectivity/source/drivers/evoab/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 8695a95..9dda360 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -88,15 +88,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index f48e844..445d81f 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -86,15 +86,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/flat/exports.dxp b/connectivity/source/drivers/flat/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/flat/exports.dxp
+++ b/connectivity/source/drivers/flat/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/flat/flat.mxp.map b/connectivity/source/drivers/flat/flat.mxp.map
index 2737c61..9a6cbf9 100755
--- a/connectivity/source/drivers/flat/flat.mxp.map
+++ b/connectivity/source/drivers/flat/flat.mxp.map
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index c773785..d6399f3 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -87,15 +87,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/hsqldb/exports.dxp b/connectivity/source/drivers/hsqldb/exports.dxp
index 3efc737..de2bf56 100755
--- a/connectivity/source/drivers/hsqldb/exports.dxp
+++ b/connectivity/source/drivers/hsqldb/exports.dxp
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream
 Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.map b/connectivity/source/drivers/hsqldb/hsqldb.map
index c1d8320..2ffbaba 100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.map
+++ b/connectivity/source/drivers/hsqldb/hsqldb.map
@@ -1,6 +1,5 @@
 UDK_3_0_0 {
     global:
-        component_getImplementationEnvironment;
         component_getFactory;
         Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream;
         Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII;
diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/jdbc/exports.dxp
+++ b/connectivity/source/drivers/jdbc/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/jdbc/jdbc.mxp.map b/connectivity/source/drivers/jdbc/jdbc.mxp.map
index e02823e..2437d90 100755
--- a/connectivity/source/drivers/jdbc/jdbc.mxp.map
+++ b/connectivity/source/drivers/jdbc/jdbc.mxp.map
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index ae6e575..cf4d8cd 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -86,16 +86,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index b385ba7..e2bea9c 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -87,16 +87,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	**
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/kab/exports.dxp b/connectivity/source/drivers/kab/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/kab/exports.dxp
+++ b/connectivity/source/drivers/kab/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 144eb9a..3319c19 100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -87,16 +87,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	**
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/macab/exports.dxp b/connectivity/source/drivers/macab/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/macab/exports.dxp
+++ b/connectivity/source/drivers/macab/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index aa352ed..5e5fc01 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -92,15 +92,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory );
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 81d029f..c7e19eb 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -242,14 +242,6 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char  **ppEnvTypeName,
-                uno_Environment ** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
 {
         MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
diff --git a/connectivity/source/drivers/mozab/exports.dxp b/connectivity/source/drivers/mozab/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/mozab/exports.dxp
+++ b/connectivity/source/drivers/mozab/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index fb79195..f875aba 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -86,16 +86,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/mysql/exports.dxp b/connectivity/source/drivers/mysql/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/drivers/mysql/exports.dxp
+++ b/connectivity/source/drivers/mysql/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index ccd0f20..b35877b 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -87,16 +87,6 @@ struct ProviderRequest
 };
 
 //---------------------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-                const sal_Char	**ppEnvTypeName,
-                uno_Environment	** /*ppEnv*/
-            )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/manager/exports.dxp b/connectivity/source/manager/exports.dxp
index f0e1c69..7003307 100755
--- a/connectivity/source/manager/exports.dxp
+++ b/connectivity/source/manager/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 6fbebf5..c06ebe8 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -45,12 +45,6 @@ extern "C"
 {
 
 //---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/)
-{
-    *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//---------------------------------------------------------------------------------------
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
diff --git a/connectivity/source/manager/sdbc.mxp.map b/connectivity/source/manager/sdbc.mxp.map
index 431725a..4a6ae43 100755
--- a/connectivity/source/manager/sdbc.mxp.map
+++ b/connectivity/source/manager/sdbc.mxp.map
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/desktop/source/app/exports.dxp b/desktop/source/app/exports.dxp
index f0e1c69..7003307 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 07ee2e6..bfb4e1e 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 d87cbb9..e621b84 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 6c3cb01..c772a2f 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 16f1082..7aeac35 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 7d2da07..5176fb2 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 e01f966..a2f9bd2 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 3d30018..6507cdb 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 f96103a..b67625d 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 5eb809d..939e820 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 218f053..c4de866 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 ca2b209..88d6906 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,
diff --git a/editeng/util/editeng.dxp b/editeng/util/editeng.dxp
index f0e1c69..7003307 100755
--- a/editeng/util/editeng.dxp
+++ b/editeng/util/editeng.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx
index e824c5a..4e88967 100644
--- a/embeddedobj/source/commonembedding/register.cxx
+++ b/embeddedobj/source/commonembedding/register.cxx
@@ -42,11 +42,6 @@ using namespace ::com::sun::star;
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
diff --git a/embeddedobj/source/msole/exports.dxp b/embeddedobj/source/msole/exports.dxp
index f0e1c69..7003307 100755
--- a/embeddedobj/source/msole/exports.dxp
+++ b/embeddedobj/source/msole/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index 184387f..b34e4f3 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -42,11 +42,6 @@ using namespace ::com::sun::star;
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
diff --git a/embeddedobj/test/MainThreadExecutor/exports.dxp b/embeddedobj/test/MainThreadExecutor/exports.dxp
index 9630d7e..51703a0 100755
--- a/embeddedobj/test/MainThreadExecutor/exports.dxp
+++ b/embeddedobj/test/MainThreadExecutor/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
 component_writeInfo
 component_getFactory
diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx
index 285dd26..c3666ec 100644
--- a/embeddedobj/test/MainThreadExecutor/register.cxx
+++ b/embeddedobj/test/MainThreadExecutor/register.cxx
@@ -41,11 +41,6 @@ using namespace ::com::sun::star;
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
diff --git a/embeddedobj/test/mtexecutor/exports.dxp b/embeddedobj/test/mtexecutor/exports.dxp
index 9630d7e..51703a0 100755
--- a/embeddedobj/test/mtexecutor/exports.dxp
+++ b/embeddedobj/test/mtexecutor/exports.dxp
@@ -1,3 +1,2 @@
-component_getImplementationEnvironment
 component_writeInfo
 component_getFactory
diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx
index 4ee7ab3..56941ee 100644
--- a/embeddedobj/test/mtexecutor/mteregister.cxx
+++ b/embeddedobj/test/mtexecutor/mteregister.cxx
@@ -42,11 +42,6 @@ using namespace ::com::sun::star;
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pRet = 0;
diff --git a/embeddedobj/util/exports.dxp b/embeddedobj/util/exports.dxp
index f0e1c69..7003307 100755
--- a/embeddedobj/util/exports.dxp
+++ b/embeddedobj/util/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index d388089..9255ab0 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -821,13 +821,6 @@ void EventAttacherImpl::removeListener
 
 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/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index aa00c74..a19d909 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -865,13 +865,6 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames()
 
 extern "C"
 {
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL fileacc_component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL fileacc_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx
index 0156204..582d316 100644
--- a/formula/source/core/api/services.cxx
+++ b/formula/source/core/api/services.cxx
@@ -59,13 +59,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     return cppu::component_getFactoryHelper(
         implName, serviceManager, registryKey, entries);
 }
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    char const ** envTypeName, uno_Environment **)
-{
-    *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 } // extern "C"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index 27daea9..f1f74cd 100644
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -59,27 +59,9 @@ static Reference< XInterface > SAL_CALL createFolderInstance(
         *new SalAquaFolderPicker( rServiceManager ) );
 }
 
-//------------------------------------------------
-// the three uno functions that will be exported
-//------------------------------------------------
-
 extern "C"
 {
 
-//------------------------------------------------
-// component_getImplementationEnvironment
-//------------------------------------------------
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
     const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 2044885..573f0ed 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -228,12 +228,6 @@ static cppu::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_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
 {
diff --git a/fpicker/source/odma/exports.map b/fpicker/source/odma/exports.map
index f4ed78b..7c6d93f 100644
--- a/fpicker/source/odma/exports.map
+++ b/fpicker/source/odma/exports.map
@@ -1,6 +1,5 @@
 UDK_3_0_0 {
     global:
-        component_getImplementationEnvironment;
         component_writeInfo;
         component_getFactory;
     local:
diff --git a/fpicker/source/odma/fps_odma.cxx b/fpicker/source/odma/fps_odma.cxx
index 6d7642c..e30197c 100644
--- a/fpicker/source/odma/fps_odma.cxx
+++ b/fpicker/source/odma/fps_odma.cxx
@@ -56,12 +56,6 @@ static cppu::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_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
     void * pServiceManager, void * pRegistryKey)
 {
diff --git a/fpicker/source/office/fps_office.cxx b/fpicker/source/office/fps_office.cxx
index 1091fe3..43be683 100644
--- a/fpicker/source/office/fps_office.cxx
+++ b/fpicker/source/office/fps_office.cxx
@@ -55,12 +55,6 @@ static cppu::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_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
 {
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index 22c3eb5..08eb037 100644
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -81,27 +81,9 @@ static Reference< XInterface > SAL_CALL createFolderInstance(
             new SalGtkFolderPicker( rServiceManager ) ) );
 }
 
-//------------------------------------------------
-// the three uno functions that will be exported
-//------------------------------------------------
-
 extern "C" 
 {
 
-//------------------------------------------------
-// component_getImplementationEnvironment
-//------------------------------------------------
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//------------------------------------------------
-//
-//------------------------------------------------
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
     const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index 2a84f65..3be4ec5 100644
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -48,14 +48,8 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS
     return Reference< XInterface >(static_cast< XFilePicker* >( new KDE4FilePicker( serviceManager ) ) );
 }
 
-// the three uno functions that will be exported
 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, uno_Interface* pSrvManager, uno_Interface* )
     {
         void* pRet = 0;
diff --git a/fpicker/source/unx/kde_unx/UnxFPentry.cxx b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
index bd25db7..5533ab7 100644
--- a/fpicker/source/unx/kde_unx/UnxFPentry.cxx
+++ b/fpicker/source/unx/kde_unx/UnxFPentry.cxx
@@ -53,26 +53,9 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS
             static_cast< XFilePicker* >( new UnxFilePicker( rServiceManager ) ) );
 }
 
-//////////////////////////////////////////////////////////////////////////
-// the three uno functions that will be exported
-//////////////////////////////////////////////////////////////////////////
-
 extern "C"
 {
 
-//////////////////////////////////////////////////////////////////////////
-// component_getImplementationEnvironment
-//////////////////////////////////////////////////////////////////////////
-
-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 )
 {
     sal_Bool bRetVal = sal_True;
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index ffae418..848296f 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -84,27 +84,9 @@ static Reference< XInterface > SAL_CALL createInstance(
     return xDlg;
 }
 
-//------------------------------------------------
-// the three uno functions that will be exported
-//------------------------------------------------
-
 extern "C" 
 {
 
-//------------------------------------------------
-// component_getImplementationEnvironment
-//------------------------------------------------
-
-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, uno_Interface* pSrvManager, uno_Interface* )
 {
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index ca3ed63..87aedb3 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -67,24 +67,10 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------
-// the 3 important functions which will be exported 
-//-----------------------------------------------------------------------
-
 extern "C" 
 {
 
 //----------------------------------------------------------------------
-// component_getImplementationEnvironment
-//----------------------------------------------------------------------
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//----------------------------------------------------------------------
 // component_getFactory 
 // returns a factory to create XFilePicker-Services
 //----------------------------------------------------------------------
diff --git a/fpicker/util/exports.dxp b/fpicker/util/exports.dxp
index f0e1c69..7003307 100644
--- a/fpicker/util/exports.dxp
+++ b/fpicker/util/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index f5510af..938aab6 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -57,7 +57,6 @@
     Please use follow public macros only!
 
     IFFACTORY( CLASS )							=> use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
-    COMPONENTGETIMPLEMENTATIONENVIRONMENT		=> use it to define exported function component_getImplementationEnvironment()
     COMPONENTGETFACTORY( IFFACTORIES )			=> use it to define exported function component_getFactory()
 
 _________________________________________________________________________________________________________________*/
@@ -79,17 +78,6 @@ ________________________________________________________________________________
 
 //*****************************************************************************************************************
 //	public
-//	define helper to get information about service environment
-//*****************************************************************************************************************
-#define	COMPONENTGETIMPLEMENTATIONENVIRONMENT																							\
-    extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const	sal_Char**			ppEnvironmentTypeName	,				\
-                                                                             uno_Environment**	            			)				\
-    {																																	\
-        *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;																	\
-    }
-
-//*****************************************************************************************************************
-//	public
 //	define method to instanciate new services
 //*****************************************************************************************************************
 #define	COMPONENTGETFACTORY( IFFACTORIES )																								\
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
index 97d5cb6..8bc6ae6 100644
--- a/framework/source/lomenubar/exports.cxx
+++ b/framework/source/lomenubar/exports.cxx
@@ -54,12 +54,6 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >&
 
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void SAL_CALL lomenubar_component_getImplementationEnvironment(const sal_Char**        ppEnvTypeName,
-                                                                                 uno_Environment** /*ppEnv*/        )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL lomenubar_component_getFactory(const sal_Char* pImplName      ,
                                                                 void*     pServiceManager,
                                                                 void*     /*pRegistryKey*/  )
diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx
index a5a15b7..19fbce8 100644
--- a/framework/source/register/register3rdcomponents.cxx
+++ b/framework/source/register/register3rdcomponents.cxx
@@ -46,8 +46,6 @@
         #include <service2.hxx>
         #endif
 
-        COMPONENTGETIMPLEMENTATIONENVIRONMENT
-
         COMPONENTGETFACTORY	(	IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -58,8 +56,6 @@
 #include <dispatch/systemexec.hxx>
 #include <jobs/shelljob.hxx>
 
-COMPONENTGETIMPLEMENTATIONENVIRONMENT
-
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::HelpOnStartup		) else
                         IFFACTORY( ::framework::TabWinFactory		) else
                         IFFACTORY( ::framework::SystemExec	        ) else
diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx
index 2ee5250..5581358 100644
--- a/framework/source/register/registerlogindialog.cxx
+++ b/framework/source/register/registerlogindialog.cxx
@@ -47,8 +47,6 @@
         #include <service2.hxx>
         #endif
 
-        COMPONENTGETIMPLEMENTATIONENVIRONMENT
-
         COMPONENTGETFACTORY	(	IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -57,8 +55,6 @@
 
 #include <services/logindialog.hxx>
 
-COMPONENTGETIMPLEMENTATIONENVIRONMENT
-
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::LoginDialog		)
                     )
 
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index 6250b71..1ec3ca9 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -44,8 +44,6 @@
         #include <service2.hxx>
         #endif
 
-        COMPONENTGETIMPLEMENTATIONENVIRONMENT
-
         COMPONENTGETFACTORY	(	IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -91,8 +89,6 @@
 #include <services/substitutepathvars.hxx>
 #include <services/pathsettings.hxx>
 
-COMPONENTGETIMPLEMENTATIONENVIRONMENT
-
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::URLTransformer					        )	else
                         IFFACTORY( ::framework::Desktop							        )	else
                         IFFACTORY( ::framework::Frame                                   )   else
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 0947b9c..6b5168c 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -46,8 +46,6 @@
         #include <service2.hxx>
         #endif
 
-        COMPONENTGETIMPLEMENTATIONENVIRONMENT
-
         COMPONENTGETFACTORY	(	IFFACTORIE( Service1 )
                                  else
                                 IFFACTORIE( Service2 )
@@ -76,8 +74,6 @@
 #include <uielement/toolbarsmenucontroller.hxx>
 #include <uielement/popupmenucontroller.hxx>
 
-COMPONENTGETIMPLEMENTATIONENVIRONMENT
-
 COMPONENTGETFACTORY	(	IFFACTORY( ::framework::MediaTypeDetectionHelper		)	
                         IFFACTORY( ::framework::MailToDispatcher                        ) else
                         IFFACTORY( ::framework::ServiceHandler                          )   else
diff --git a/linguistic/source/lngreg.cxx b/linguistic/source/lngreg.cxx
index bbfc7d8..4cef6f2 100644
--- a/linguistic/source/lngreg.cxx
+++ b/linguistic/source/lngreg.cxx
@@ -75,17 +75,9 @@ extern void * SAL_CALL GrammarCheckingIterator_getFactory
 );
 
 
-// definition of the two functions that are used to provide the services
-
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *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/linguistic/source/makefile.mk b/linguistic/source/makefile.mk
index 5a24ac4..5d6909e 100755
--- a/linguistic/source/makefile.mk
+++ b/linguistic/source/makefile.mk
@@ -93,7 +93,6 @@ DEF1DES     =Linguistic main DLL
 
 .IF "$(GUI)"=="WNT"
 DEF1EXPORT1 = component_getFactory
-DEF1EXPORT2 = component_getImplementationEnvironment
 .ENDIF
 
 # --- Targets ------------------------------------------------------
diff --git a/linguistic/workben/exports.dxp b/linguistic/workben/exports.dxp
index b0f85bf..8621486 100755
--- a/linguistic/workben/exports.dxp
+++ b/linguistic/workben/exports.dxp
@@ -1,3 +1,2 @@
 component_getFactory
-component_getImplementationEnvironment
 component_writeInfo
diff --git a/linguistic/workben/sreg.cxx b/linguistic/workben/sreg.cxx
index c923c1e..ba2e883 100644
--- a/linguistic/workben/sreg.cxx
+++ b/linguistic/workben/sreg.cxx
@@ -59,12 +59,6 @@ sal_Bool SAL_CALL component_writeInfo(
     return SpellChecker_writeInfo( pServiceManager, pRegistryKey );
 }
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *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/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 45bca2f..c4e1eeb 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 9417d12..a9bcf7a 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 f0e1c69..7003307 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 a1b21dc..219dca1 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 dedb00b..8f2b53b 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 f0e1c69..7003307 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 1e453e7..b05ea27 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 f0e1c69..7003307 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 efbaa08..dc2f7ee 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 7d076b2..96558f3 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 f0e1c69..7003307 100755
--- a/scripting/util/exports.dxp
+++ b/scripting/util/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 8c0cc6f..ecc6a23 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2143,13 +2143,6 @@ SFX_IMPL_SINGLEFACTORY( TestMouseClickHandler );
 
 extern "C" {
 
-SFX2_DLLPUBLIC void SAL_CALL sfx_component_getImplementationEnvironment(
-    const sal_Char**  ppEnvironmentTypeName	,
-    uno_Environment** )
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
 SFX2_DLLPUBLIC void* SAL_CALL sfx_component_getFactory(
     const sal_Char*	pImplementationName	,
     void*           pServiceManager		,
diff --git a/sfx2/workben/custompanel/ctp_services.cxx b/sfx2/workben/custompanel/ctp_services.cxx
index 11a538a..00d5788 100644
--- a/sfx2/workben/custompanel/ctp_services.cxx
+++ b/sfx2/workben/custompanel/ctp_services.cxx
@@ -74,12 +74,6 @@ namespace sd { namespace colortoolpanel
 extern "C"
 {
     //------------------------------------------------------------------------------------------------------------------
-    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
-    {
-        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
     sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey )
     {
         return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, ::sd::colortoolpanel::s_aServiceEntries );
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index 6fd80da..f38eab4 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -277,11 +277,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/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index ffd1aea..632ccdd 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -228,11 +228,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/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx
index 018003c..47b2b03 100644
--- a/shell/source/backends/kde4be/kde4backend.cxx
+++ b/shell/source/backends/kde4be/kde4backend.cxx
@@ -245,11 +245,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/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx
index 8ff27eb..1133ab8 100644
--- a/shell/source/backends/kdebe/kdebackend.cxx
+++ b/shell/source/backends/kdebe/kdebackend.cxx
@@ -245,11 +245,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/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx
index baf321b..9e54a71 100644
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -63,14 +63,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 //------------------------------------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char **aEnvTypeName, uno_Environment ** /*aEnvironment*/) {
-    
-    *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName,
     void *aServiceManager,
     void *aRegistryKey) {
diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx
index 0af4d2f..39295e3 100644
--- a/shell/source/backends/macbe/macbecdef.cxx
+++ b/shell/source/backends/macbe/macbecdef.cxx
@@ -64,14 +64,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 //------------------------------------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char **aEnvTypeName, uno_Environment ** /*aEnvironment*/) {
-
-    *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey)
 {
 
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index 9cac967..2a555dd 100644
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -64,14 +64,6 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
 
 //------------------------------------------------------------------------------
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char **aEnvTypeName, uno_Environment ** /*aEnvironment*/) {
-    
-    *aEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
-//------------------------------------------------------------------------------
-
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *aImplementationName,
     void *aServiceManager,
     void *aRegistryKey) {
diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx
index 47b803c..0b38025 100644
--- a/shell/source/cmdmail/cmdmailentry.cxx
+++ b/shell/source/cmdmail/cmdmailentry.cxx
@@ -66,23 +66,8 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------
-// the 2 important functions which will be exported
-//-----------------------------------------------------------------------
-
 extern "C" 
 {
-
-//----------------------------------------------------------------------
-// component_getImplementationEnvironment
-//----------------------------------------------------------------------
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 //----------------------------------------------------------------------
diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp
index f0e1c69..7003307 100755
--- a/shell/source/cmdmail/exports.dxp
+++ b/shell/source/cmdmail/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index 5e9d913..18f903b 100644
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -65,23 +65,8 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------
-// the 3 important functions which will be exported 
-//-----------------------------------------------------------------------
-
 extern "C" 
 {
-
-//----------------------------------------------------------------------
-// component_getImplementationEnvironment
-//----------------------------------------------------------------------
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 //----------------------------------------------------------------------
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index cd4c8b2..d734379 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -67,23 +67,8 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------
-// the 2 important functions which will be exported 
-//-----------------------------------------------------------------------
-
 extern "C" 
 {
-
-//----------------------------------------------------------------------
-// component_getImplementationEnvironment
-//----------------------------------------------------------------------
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ":affine";
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 // returns a factory to create XFilePicker-Services
diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp
index f0e1c69..7003307 100755
--- a/shell/source/win32/exports.dxp
+++ b/shell/source/win32/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/shell/source/win32/simplemail/exports.dxp b/shell/source/win32/simplemail/exports.dxp
index f0e1c69..7003307 100755
--- a/shell/source/win32/simplemail/exports.dxp
+++ b/shell/source/win32/simplemail/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index 0872cb5..814bee3 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -67,23 +67,8 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------
-// the 2 important functions which will be exported 
-//-----------------------------------------------------------------------
-
 extern "C" 
 {
-
-//----------------------------------------------------------------------
-// component_getImplementationEnvironment
-//----------------------------------------------------------------------
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 //----------------------------------------------------------------------
 // component_getFactory 
 // returns a factory to create XFilePicker-Services
diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx
index f5bf707..2354ef0 100644
--- a/svx/source/core/coreservices.cxx
+++ b/svx/source/core/coreservices.cxx
@@ -72,12 +72,6 @@ extern Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupporte
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL svxcore_component_getImplementationEnvironment (
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory (
     const sal_Char * pImplName, void * pServiceManager, void *  )
 {
diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index f76a197..507ccda 100644
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/services.cxx
@@ -48,12 +48,6 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio
 extern "C"
 {
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL textconversiondlgs_component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 8b86066..268a922 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -256,12 +256,6 @@ extern uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedS
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL svx_component_getImplementationEnvironment (
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL svx_component_getFactory (
     const sal_Char * pImplName, void * pServiceManager, void *  )
 {
diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp
index f0e1c69..7003307 100755
--- a/svx/util/svx.dxp
+++ b/svx/util/svx.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/sysui/util/exports.dxp b/sysui/util/exports.dxp
index f0e1c69..7003307 100755
--- a/sysui/util/exports.dxp
+++ b/sysui/util/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx
index 782ca8d..785df1b 100644
--- a/ucb/source/cacher/cacheserv.cxx
+++ b/ucb/source/cacher/cacheserv.cxx
@@ -43,13 +43,6 @@ using namespace com::sun::star::registry;
 using ::rtl::OUString;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/core/exports2.dxp b/ucb/source/core/exports2.dxp
index 8091459..eb53b56 100755
--- a/ucb/source/core/exports2.dxp
+++ b/ucb/source/core/exports2.dxp
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 
 _ZTIN3com3sun4star3ucb34InteractiveBadTransferURLExceptionE
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 28edde0..0d8ac35 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -42,13 +42,6 @@ using ::rtl::OUString;
 
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx
index a29915f..194dc3e 100644
--- a/ucb/source/sorter/sortmain.cxx
+++ b/ucb/source/sorter/sortmain.cxx
@@ -38,13 +38,6 @@ using ::rtl::OUString;
 
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 33c86bb..9893f90 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -268,12 +268,6 @@ static const ::cppu::ImplementationEntry s_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,
     lang::XMultiServiceFactory * pServiceManager,
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 47d0385..73ac05e 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -75,12 +75,6 @@ namespace ucb { namespace ucp { namespace ext
 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, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries );
diff --git a/ucb/source/ucp/file/exports2.dxp b/ucb/source/ucp/file/exports2.dxp
index 4804c8d..803f1cc 100755
--- a/ucb/source/ucp/file/exports2.dxp
+++ b/ucb/source/ucp/file/exports2.dxp
@@ -1,4 +1,3 @@
-component_getImplementationEnvironment
 component_getFactory
 
 _ZTIN3com3sun4star3ucb31InteractiveAugmentedIOExceptionE
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index bfd9e0f..b7f76fe 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -51,13 +51,6 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::container;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
 {
diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx
index f9d704b..a868083 100644
--- a/ucb/source/ucp/ftp/ftpservices.cxx
+++ b/ucb/source/ucp/ftp/ftpservices.cxx
@@ -37,13 +37,6 @@ using namespace com::sun::star;
 using namespace ftp;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 0b1b782..a01e865 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -103,12 +103,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char  **ppEnvTypeName, uno_Environment **)
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName,
     void *pServiceManager, void * )
 {
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index 8c42c01..f2994d5 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -144,12 +144,6 @@ ContentProvider::queryContent(
 
 //============================ shlib entry points =============================================
 
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char  **ppEnvTypeName,
-                    uno_Environment **/*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName,
               void           *pServiceManager,
               void           */*pRegistryKey*/ )
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index 182d0dd..65b4f8e 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -37,13 +37,6 @@ using namespace com::sun::star;
 using namespace hierarchy_ucp;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/odma/odma_services.cxx b/ucb/source/ucp/odma/odma_services.cxx
index 907d9c5..5dfd85b 100644
--- a/ucb/source/ucp/odma/odma_services.cxx
+++ b/ucb/source/ucp/odma/odma_services.cxx
@@ -42,13 +42,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx
index 9515c67..c3cbf3b 100644
--- a/ucb/source/ucp/package/pkgservices.cxx
+++ b/ucb/source/ucp/package/pkgservices.cxx
@@ -36,13 +36,6 @@
 using namespace com::sun::star;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx
index c34ea8d..9cd19a9 100644
--- a/ucb/source/ucp/tdoc/tdoc_services.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_services.cxx
@@ -40,13 +40,6 @@ using namespace com::sun::star;
 using namespace tdoc_ucp;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx
index b1dfef5..e9c712e 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -36,13 +36,6 @@
 using namespace com::sun::star;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 5aeb870..9ec6b84 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -43,23 +43,6 @@ using namespace com::sun::star::registry;
 
 using ::rtl::OUString;
 
-//============================================================================
-//
-//  component_getImplementationEnvironment
-//
-//============================================================================
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
-                       uno_Environment **)
-{
-    *pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//============================================================================
-//
-//  component_getFactory
-//
-//============================================================================
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char const * pImplName,
                         void * pServiceManager,
diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx
index 3388051..9292f87 100644
--- a/vbahelper/source/msforms/service.cxx
+++ b/vbahelper/source/msforms/service.cxx
@@ -51,13 +51,6 @@ extern sdecl::ServiceDecl const serviceDecl;
 
 extern "C"
 {
-    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( 
-        const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-    {
-        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/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index e4dc9dc..425e34f 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -37,13 +37,6 @@
 using namespace com::sun::star;
 
 //=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, 
     void * pServiceManager, 
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 355f6c5..178ee1b 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -257,15 +257,6 @@ TVFactory::CreateInstance(
 }
 
 //=========================================================================
-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;
-}
-
-//=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey )
 {
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index ab24493..4bda2e6 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -164,11 +164,6 @@ extern "C"
 {
 #endif
 
-XMLOFF_DLLPUBLIC void SAL_CALL xo_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 #define SINGLEFACTORY(classname)\
         if( classname##_getImplementationName().equalsAsciiL( pImplName, nImplNameLen ) )\
         {\
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index 4bdf3c4..86d6473 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -142,11 +142,6 @@ extern "C"
 {
 #endif
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL xof_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = NULL;
diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx
index 359d0f9..d0d6dd7 100644
--- a/xmlscript/source/misc/unoservices.cxx
+++ b/xmlscript/source/misc/unoservices.cxx
@@ -106,14 +106,6 @@ namespace xmlscript
 
 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 )
     {