From a90983bd658b6f69a353ccdf0d332ed280b69711 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Tue, 12 Jul 2011 17:53:48 +0200 Subject: Remove component_getImplementationEnvironment methods --- 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 - 11 files changed, 111 deletions(-) (limited to 'fpicker') diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx index 405f201d1058..a1dac9a21cd4 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 f25fbdb062e1..bb3828791331 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 f4ed78b9e970..7c6d93f87852 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 6d7642ca0674..e30197c2d641 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 55e4f9afd574..8237b47640c6 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 c4dd0ecfd815..0ea7fb4bd8c2 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 2dbf9997f320..1543645a0fcd 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 bd25db73e8ed..5533ab7c163d 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 b18f24d3f57b..fed7714c1b75 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 ce9b292084d5..03ee44cb62b7 100644 --- a/fpicker/source/win32/folderpicker/Fopentry.cxx +++ b/fpicker/source/win32/folderpicker/Fopentry.cxx @@ -67,23 +67,9 @@ 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 f0e1c69934bc..70033078921a 100644 --- a/fpicker/util/exports.dxp +++ b/fpicker/util/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory -- cgit