Remove component_getImplementationEnvironment

56 files changed, 3 insertions, 267 deletions

diff --git a/binfilter/bf_forms/source/misc/forms_services.cxx b/binfilter/bf_forms/source/misc/forms_services.cxx
index 253b535d0..78cae8125 100644
--- a/binfilter/bf_forms/source/misc/forms_services.cxx
+++ b/binfilter/bf_forms/source/misc/forms_services.cxx
@@ -477,12 +477,6 @@ void SAL_CALL createRegistryInfo_FORMS()
 }
 
 //---------------------------------------------------------------------------------------
-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, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     if (!_pServiceManager || !_pImplName)
diff --git a/binfilter/bf_forms/util/frm.dxp b/binfilter/bf_forms/util/frm.dxp
index f0e1c6993..700330789 100644
--- a/binfilter/bf_forms/util/frm.dxp
+++ b/binfilter/bf_forms/util/frm.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
index 897808f7c..daaf396ca 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
@@ -160,12 +160,6 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD
 
 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/binfilter/bf_sc/util/bf_sc.map b/binfilter/bf_sc/util/bf_sc.map
index 81a7cc123..3c197a9f9 100644
--- a/binfilter/bf_sc/util/bf_sc.map
+++ b/binfilter/bf_sc/util/bf_sc.map
@@ -4,7 +4,6 @@ UDK_3_0_0 {
         CreateObjScDocShellDll;
         InitScDll;
         DeInitScDll;
-        component_getImplementationEnvironment;
         component_getFactory;
     local:
         *;
diff --git a/binfilter/bf_sc/util/makefile.mk b/binfilter/bf_sc/util/makefile.mk
index 594f88633..bbe72863d 100644
--- a/binfilter/bf_sc/util/makefile.mk
+++ b/binfilter/bf_sc/util/makefile.mk
@@ -155,7 +155,6 @@ $(MISC)$/$(SHL1TARGET).def:  makefile.mk
     @echo   CreateObjScDocShellDll @21                         >>$@
     @echo   InitScDll @22                                          >>$@
     @echo   DeInitScDll @23                                        >>$@
-    @echo   component_getImplementationEnvironment @24             >>$@
     @echo   component_getFactory @26                               >>$@
 .ENDIF
 .IF "$(OPTLINKS)" == "YES"
@@ -175,7 +174,6 @@ $(MISC)$/$(SHL1TARGET).def:  makefile.mk
     @echo   _CreateObjScDocShellDll                             >>$@
     @echo   _InitScDll                                              >>$@
     @echo   _DeInitScDll                                            >>$@
-    @echo   _component_getImplementationEnvironment                 >>$@
     @echo   _component_getFactory                                   >>$@
 .ENDIF
 
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
index 3531a6ff0..9351bce0c 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_register.cxx
@@ -41,12 +41,6 @@ extern uno::Reference< uno::XInterface > SAL_CALL SchDocument_createInstance(con
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(	const	sal_Char**			ppEnvironmentTypeName	,
-                                                                uno_Environment**	/*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/binfilter/bf_sch/util/bf_sch.map b/binfilter/bf_sch/util/bf_sch.map
index 95c6e9f61..9332bde58 100644
--- a/binfilter/bf_sch/util/bf_sch.map
+++ b/binfilter/bf_sch/util/bf_sch.map
@@ -23,7 +23,6 @@ UDK_3_0_0 {
         SchConvertChartRangeForCalc;
         SchMemChartResetTranslation;
         SchMemChartUpdateTranslation;
-        component_getImplementationEnvironment;
         component_getFactory;
     local:
         *;
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
index f5640caaf..034018b26 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_facreg.cxx
@@ -52,11 +52,6 @@ extern "C"
 {
 #endif
 
-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/binfilter/bf_sd/util/bf_sd.map b/binfilter/bf_sd/util/bf_sd.map
index 4faf70ac2..e6daa4c63 100644
--- a/binfilter/bf_sd/util/bf_sd.map
+++ b/binfilter/bf_sd/util/bf_sd.map
@@ -6,7 +6,6 @@ UDK_3_0_0 {
         CreateObjSdGraphicDocShellDll;
         InitSdDll;
         DeInitSdDll;
-        component_getImplementationEnvironment;
         component_getFactory;
     local:
         *;
diff --git a/binfilter/bf_sd/util/exports.dxp b/binfilter/bf_sd/util/exports.dxp
index 0cb5620a1..700330789 100644
--- a/binfilter/bf_sd/util/exports.dxp
+++ b/binfilter/bf_sd/util/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
-component_getFactory
\ No newline at end of file
+component_getFactory
diff --git a/binfilter/bf_sd/util/makefile.mk b/binfilter/bf_sd/util/makefile.mk
index 1bd8928b9..a01570cd1 100644
--- a/binfilter/bf_sd/util/makefile.mk
+++ b/binfilter/bf_sd/util/makefile.mk
@@ -134,7 +134,6 @@ $(MISC)$/$(SHL1TARGET).def:
     @echo   CreateObjSdGraphicDocShellDll @23                      >>$@
     @echo   InitSdDll @24                                          >>$@
     @echo   DeInitSdDll @25                                        >>$@
-    @echo component_getImplementationEnvironment 				   >>$@
     @echo component_getFactory									   >>$@
 .ENDIF
 
@@ -153,7 +152,6 @@ $(MISC)$/$(SHL1TARGET).def:
     @echo   _CreateObjSdGraphicDocShellDll                          >>$@
     @echo   _InitSdDll                                              >>$@
     @echo   _DeInitSdDll                                            >>$@
-    @echo _component_getImplementationEnvironment 		    >>$@
     @echo _component_getFactory					    >>$@
 .ENDIF
 
diff --git a/binfilter/bf_starmath/source/starmath_register.cxx b/binfilter/bf_starmath/source/starmath_register.cxx
index 984fcba4c..f01cf95ab 100644
--- a/binfilter/bf_starmath/source/starmath_register.cxx
+++ b/binfilter/bf_starmath/source/starmath_register.cxx
@@ -98,13 +98,6 @@ extern Reference< XInterface > SAL_CALL
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-        const  sal_Char**   ppEnvironmentTypeName,
-        uno_Environment**   /*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/binfilter/bf_starmath/util/bf_sm.map b/binfilter/bf_starmath/util/bf_sm.map
index 69b020ca9..8272fb2d2 100644
--- a/binfilter/bf_starmath/util/bf_sm.map
+++ b/binfilter/bf_starmath/util/bf_sm.map
@@ -4,7 +4,6 @@ UDK_3_0_0 {
         CreateObjSmDocShellDll;
         InitSmDll;
         DeInitSmDll;
-        component_getImplementationEnvironment;
         component_getFactory;
     local:
         *;
diff --git a/binfilter/bf_svtools/source/uno/svt_registerservices.cxx b/binfilter/bf_svtools/source/uno/svt_registerservices.cxx
index 7346d3387..d8e0a5962 100644
--- a/binfilter/bf_svtools/source/uno/svt_registerservices.cxx
+++ b/binfilter/bf_svtools/source/uno/svt_registerservices.cxx
@@ -61,12 +61,6 @@ DECLARE_CREATEINSTANCE( SvNumberFormatsSupplierServiceObject )
 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/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
index d40284c17..e5d7ffd5e 100644
--- a/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
+++ b/binfilter/bf_svx/source/unodraw/svx_unoctabl.cxx
@@ -224,11 +224,6 @@ void* SAL_CALL sfx2_component_getFactory(	const	sal_Char*	pImplementationName	,
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 void SAL_CALL writeInfo( registry::XRegistryKey * pRegistryKey, const OUString& rImplementationName, const uno::Sequence< OUString >& rServices )
 {
     uno::Reference< registry::XRegistryKey > xNewKey(
diff --git a/binfilter/bf_svx/util/svx.dxp b/binfilter/bf_svx/util/svx.dxp
index f0e1c6993..700330789 100644
--- a/binfilter/bf_svx/util/svx.dxp
+++ b/binfilter/bf_svx/util/svx.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx b/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
index 0f8d5e427..298b15731 100644
--- a/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
+++ b/binfilter/bf_sw/source/ui/uno/sw_unofreg.cxx
@@ -99,13 +99,6 @@ extern "C"
 {
 #endif
 
-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/binfilter/bf_sw/util/bf_sw.map b/binfilter/bf_sw/util/bf_sw.map
index a3bd532f9..0aaf8dfb7 100644
--- a/binfilter/bf_sw/util/bf_sw.map
+++ b/binfilter/bf_sw/util/bf_sw.map
@@ -8,7 +8,6 @@ UDK_3_0_0 {
         CreateObjSwGlobalDocShellDll;
         InitSwDll;
         DeInitSwDll;
-        component_getImplementationEnvironment;
         component_getFactory;
     local:
         *;
diff --git a/binfilter/bf_sw/util/makefile.mk b/binfilter/bf_sw/util/makefile.mk
index ac89fbb71..31ee3e5ca 100644
--- a/binfilter/bf_sw/util/makefile.mk
+++ b/binfilter/bf_sw/util/makefile.mk
@@ -162,7 +162,6 @@ $(MISC)$/$(SHL2TARGET).def:  makefile.mk
     @echo   CreateObjSwGlobalDocShellDll @23                         >>$@
     @echo   InitSwDll @24                                          >>$@
     @echo   DeInitSwDll @25                                        >>$@
-    @echo   component_getImplementationEnvironment @50				>>$@
     @echo   component_getFactory @52								>>$@
 
 .ENDIF
@@ -189,7 +188,6 @@ $(MISC)$/$(SHL2TARGET).def:  makefile.mk
     @echo   _CreateObjSwGlobalDocShellDll                           >>$@
     @echo   _InitSwDll                                              >>$@
     @echo   _DeInitSwDll                                            >>$@
-    @echo   _component_getImplementationEnvironment                 >>$@
     @echo   _component_getFactory    			            >>$@
 
 .ENDIF
diff --git a/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx b/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
index 6f30b0c59..b2d854c9d 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_facreg.cxx
@@ -212,11 +212,6 @@ extern "C"
 {
 #endif
 
-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/binfilter/bf_xmloff/util/exports.dxp b/binfilter/bf_xmloff/util/exports.dxp
index 0cb5620a1..700330789 100644
--- a/binfilter/bf_xmloff/util/exports.dxp
+++ b/binfilter/bf_xmloff/util/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
-component_getFactory
\ No newline at end of file
+component_getFactory
diff --git a/binfilter/binfilterdetect/source/bindetect.cxx b/binfilter/binfilterdetect/source/bindetect.cxx
index d0e655016..ddd2350fd 100644
--- a/binfilter/binfilterdetect/source/bindetect.cxx
+++ b/binfilter/binfilterdetect/source/bindetect.cxx
@@ -747,12 +747,6 @@ UNOREFERENCE< UNOXINTERFACE > SAL_CALL BinFilterDetect::impl_createInstance( con
 }
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(	const	sal_Char**			ppEnvironmentTypeName	,
-                                                                uno_Environment**	/*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/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx b/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
index 5a5861168..c13adc6f6 100644
--- a/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
+++ b/binfilter/filter/source/bf_migrate/bf_migrateexports.cxx
@@ -47,14 +47,6 @@ 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;
-}
-
-//==================================================================================================
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey)
 {
     void* pRet = 0;
diff --git a/binfilter/filter/source/bf_migrate/exports.dxp b/binfilter/filter/source/bf_migrate/exports.dxp
index f0e1c6993..700330789 100644
--- a/binfilter/filter/source/bf_migrate/exports.dxp
+++ b/binfilter/filter/source/bf_migrate/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
index b41ee3834..8fcf66796 100644
--- a/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
+++ b/binfilter/filter/source/bf_offwrp/bf_wrapper.cxx
@@ -190,13 +190,6 @@ void SAL_CALL bf_OfficeWrapper::removeEventListener( const Reference< XEventList
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char** ppEnvironmentTypeName,
-    uno_Environment** /*ppEnvironment*/)
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
     const sal_Char* pImplementationName,
     void* pServiceManager,
diff --git a/binfilter/filter/source/bf_offwrp/exports.dxp b/binfilter/filter/source/bf_offwrp/exports.dxp
index f0e1c6993..700330789 100644
--- a/binfilter/filter/source/bf_offwrp/exports.dxp
+++ b/binfilter/filter/source/bf_offwrp/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/filter/inc/registration.hxx b/filter/inc/registration.hxx
index 7bfe0d538..060a77dd9 100644
--- a/filter/inc/registration.hxx
+++ b/filter/inc/registration.hxx
@@ -49,17 +49,6 @@ namespace comphelper{
 
 /** TODO    doc
  */
-#define _COMPHELPER_COMPONENT_GETIMPLEMENTATIONENVIRONMENT                                                          \
-    extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char**        ppEnvironmentTypeName,  \
-                                                                          uno_Environment** /* ppEnvironment */ )   \
-    {                                                                                                               \
-        *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;                                                \
-    }
-
-//_______________________________________________
-
-/** TODO    doc
- */
 #define _COMPHELPER_MULTIINSTANCEFACTORY(IMPLEMENTATIONNAME, SERVICENAMES, FACTORYMETHOD)   \
     if (IMPLEMENTATIONNAME == sImplName)                                                    \
         xFactory = ::cppu::createSingleFactory(xSMGR             ,                          \
diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx
index 7c5733511..94ce1e58b 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -99,9 +99,6 @@ static void InitConstants()
     theConstantsInitializer::get();
 }
 
-// extern "C" component_getImplementationEnvironment()
-_COMPHELPER_COMPONENT_GETIMPLEMENTATIONENVIRONMENT
-
 // extern "C" component_getFactory()
 _COMPHELPER_COMPONENT_GETFACTORY
 (
diff --git a/filter/source/filtertracer/exports.dxp b/filter/source/filtertracer/exports.dxp
index 0cb5620a1..700330789 100644
--- a/filter/source/filtertracer/exports.dxp
+++ b/filter/source/filtertracer/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
-component_getFactory
\ No newline at end of file
+component_getFactory
diff --git a/filter/source/filtertracer/filtertraceruno.cxx b/filter/source/filtertracer/filtertraceruno.cxx
index db96e0d09..7c91072ab 100644
--- a/filter/source/filtertracer/filtertraceruno.cxx
+++ b/filter/source/filtertracer/filtertraceruno.cxx
@@ -43,15 +43,6 @@ static REF( NMSP_UNO::XInterface ) SAL_CALL create_FilterTracer( const REF( NMSP
     return REF( NMSP_UNO::XInterface )( *new FilterTracer( 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 -
 // ------------------------
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index f01326cc6..df3af2b27 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -56,14 +56,6 @@ using namespace ::swf;
 
 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/filter/source/msfilter/powerpoint/pptimporteruno.cxx b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
index f7ff058d8..2396e1810 100644
--- a/filter/source/msfilter/powerpoint/pptimporteruno.cxx
+++ b/filter/source/msfilter/powerpoint/pptimporteruno.cxx
@@ -39,11 +39,6 @@ static REF( NMSP_UNO::XInterface ) SAL_CALL create_PptImporter( const REF( NMSP_
     return REF( NMSP_UNO::XInterface )( *new PptImporter( 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 */ )
 {
     REF( NMSP_LANG::XSingleServiceFactory ) xFactory;
diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx
index 09a303f72..cd081b5f7 100644
--- a/filter/source/msfilter/services.cxx
+++ b/filter/source/msfilter/services.cxx
@@ -59,17 +59,7 @@ static ::cppu::ImplementationEntry const spServices[] =
 
 } // namespace
 
-// ----------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-        const sal_Char** ppEnvironmentTypeName, uno_Environment** /*ppEnvironment*/ )
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
 }
-
-// ============================================================================
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index 005bc9a11..4be92503f 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -235,8 +235,6 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference
 
 }
 
-_COMPHELPER_COMPONENT_GETIMPLEMENTATIONENVIRONMENT
-
 // extern "C" component_getFactory()
 _COMPHELPER_COMPONENT_GETFACTORY
 (
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index e18a72e53..79630d11d 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -47,14 +47,6 @@ using namespace ::com::sun::star::registry;
 
 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*/ )
     {
         OUString    aImplName( OUString::createFromAscii( pImplName ) );
diff --git a/filter/source/placeware/exports.dxp b/filter/source/placeware/exports.dxp
index f0e1c6993..700330789 100644
--- a/filter/source/placeware/exports.dxp
+++ b/filter/source/placeware/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx
index 2e063dba7..4c566068a 100644
--- a/filter/source/placeware/uno.cxx
+++ b/filter/source/placeware/uno.cxx
@@ -53,13 +53,6 @@ using namespace ::pwp;
 
 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/filter/source/svg/exports.map b/filter/source/svg/exports.map
index d679dfda4..e28b04cb0 100644
--- a/filter/source/svg/exports.map
+++ b/filter/source/svg/exports.map
@@ -1,6 +1,5 @@
 UDK_3_0_0 {
         global:
-                component_getImplementationEnvironment;
                 component_getFactory;
                 GraphicImport;
 
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index e330954d7..e1abb7ac4 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -46,13 +46,6 @@ using namespace T602ImportFilter;
 
 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/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index 12c3e7cc9..3caa997df 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -47,13 +47,6 @@ 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;
-}
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx
index 611d236f2..a8a2c7fc8 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -48,13 +48,6 @@ 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;
-}
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
diff --git a/filter/source/xsltdialog/exports.dxp b/filter/source/xsltdialog/exports.dxp
index f0e1c6993..700330789 100644
--- a/filter/source/xsltdialog/exports.dxp
+++ b/filter/source/xsltdialog/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index aba29a7c2..7f3fa078e 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -398,14 +398,6 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu
 
 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/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 4b6d7d295..09da859fe 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -588,12 +588,6 @@ using namespace XSLT;
 
 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/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 91db601a3..b5cfafe17 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -338,19 +338,8 @@ Sequence< OUString> HwpImportFilter::getSupportedServiceNames() throw(::com::sun
     return aRet;
 }
 
-/////////////////////////////////////////////////////////////////////////////////////
-// The below three C functions are nessesary for this shared library is treaded as
-// UNO component library.
-/////////////////////////////////////////////////////////////////////////////////////
 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 *  )
     {
         void * pRet = 0;
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index 5f82b1e9d..d889515ac 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -19,11 +19,6 @@ 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;
-}
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
diff --git a/oox/source/core/services.cxx b/oox/source/core/services.cxx
index 86bf0b6d7..8a423b815 100644
--- a/oox/source/core/services.cxx
+++ b/oox/source/core/services.cxx
@@ -81,17 +81,7 @@ static ::cppu::ImplementationEntry const spServices[] =
 
 } // namespace
 
-// ----------------------------------------------------------------------------
-
-extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-        const sal_Char** ppEnvironmentTypeName, uno_Environment** /*ppEnvironment*/ )
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
 {
     return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
 }
-
-// ============================================================================
diff --git a/unoxml/source/rdf/librdf_services.cxx b/unoxml/source/rdf/librdf_services.cxx
index 95571a386..845314b1f 100644
--- a/unoxml/source/rdf/librdf_services.cxx
+++ b/unoxml/source/rdf/librdf_services.cxx
@@ -39,12 +39,6 @@ using namespace ::com::sun::star;
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL unordf_component_getImplementationEnvironment(const sal_Char **o_ppEnvironmentTypeName,
-    uno_Environment ** /* ppEnvironment */)
-{
-    *o_ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 static ::cppu::ImplementationEntry const entries[] = {
     { &comp_CBlankNode::_create,
       &comp_CBlankNode::_getImplementationName,
diff --git a/unoxml/source/service/services.cxx b/unoxml/source/service/services.cxx
index 29e95a59a..a49ba1387 100644
--- a/unoxml/source/service/services.cxx
+++ b/unoxml/source/service/services.cxx
@@ -55,11 +55,6 @@ using namespace ::com::sun::star::registry;
 extern "C"
 {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL unoxml_component_getImplementationEnvironment(const sal_Char **ppEnvironmentTypeName, uno_Environment ** /*ppEnvironment */)
-{
-    *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
-}
-
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL unoxml_component_getFactory(const sal_Char *pImplementationName, void *pServiceManager, void * /*pRegistryKey*/)
 {
     void* pReturn = NULL ;
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index ed930c5c5..bf6d60daa 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -60,11 +60,6 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
     { 0, 0, 0, 0, 0, 0 } // terminate with NULL
 };
 
-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(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
 {
     return ::cppu::component_getFactoryHelper(implName, xMgr, xRegistry, s_component_entries );
diff --git a/writerfilter/unocomponent/component.cxx b/writerfilter/unocomponent/component.cxx
index 6ac1fc76b..9fa7e563e 100644
--- a/writerfilter/unocomponent/component.cxx
+++ b/writerfilter/unocomponent/component.cxx
@@ -56,12 +56,6 @@ static struct ::cppu::ImplementationEntry s_component_entries [] =
     { 0, 0, 0, 0, 0, 0 } // terminate with NULL
 };
 
-
-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(sal_Char const * implName, ::com::sun::star::lang::XMultiServiceFactory * xMgr, ::com::sun::star::registry::XRegistryKey * xRegistry )
 {
     fprintf(stderr, "Loading service: %s: ", implName);
diff --git a/writerfilter/unocomponent/exports.dxp b/writerfilter/unocomponent/exports.dxp
index f0e1c6993..700330789 100644
--- a/writerfilter/unocomponent/exports.dxp
+++ b/writerfilter/unocomponent/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
diff --git a/writerperfect/source/vsdimp/visioimport_genericfilter.cxx b/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
index be152d1e3..ddc3f25fc 100644
--- a/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
+++ b/writerperfect/source/vsdimp/visioimport_genericfilter.cxx
@@ -41,11 +41,6 @@ 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;
-}
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
diff --git a/writerperfect/source/wpdimp/wpft_genericfilter.cxx b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
index 8c2caa3aa..2cfc8d849 100644
--- a/writerperfect/source/wpdimp/wpft_genericfilter.cxx
+++ b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
@@ -40,13 +40,6 @@ 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;
-}
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
diff --git a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
index c453a9c10..4a7f97a0d 100644
--- a/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
+++ b/writerperfect/source/wpgimp/wpgimport_genericfilter.cxx
@@ -41,11 +41,6 @@ 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;
-}
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {
diff --git a/writerperfect/source/wpsimp/msworks_genericfilter.cxx b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
index 2213c0c52..87dc407c9 100644
--- a/writerperfect/source/wpsimp/msworks_genericfilter.cxx
+++ b/writerperfect/source/wpsimp/msworks_genericfilter.cxx
@@ -41,11 +41,6 @@ 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;
-}
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
 {