diff options
author | Matus Kukan <matus.kukan@gmail.com> | 2011-07-03 12:36:54 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-12 17:58:44 +0200 |
commit | bc925cc2ad591f7ac2d956ef31db7be3497a99e9 (patch) | |
tree | 2e2cebaa9a4c2bc78e287210ef3669fa92f4547a | |
parent | use oox filter for *all* control import (diff) | |
download | core-bc925cc2ad591f7ac2d956ef31db7be3497a99e9.tar.gz core-bc925cc2ad591f7ac2d956ef31db7be3497a99e9.zip |
Remove component_getImplementationEnvironment
-rw-r--r-- | chart2/source/controller/main/_serviceregistration_controller.cxx | 7 | ||||
-rw-r--r-- | chart2/source/inc/exports.dxp | 1 | ||||
-rw-r--r-- | chart2/source/model/main/_serviceregistration_model.cxx | 7 | ||||
-rw-r--r-- | chart2/source/tools/_serviceregistration_tools.cxx | 7 | ||||
-rw-r--r-- | chart2/source/view/main/_serviceregistration_view.cxx | 7 | ||||
-rw-r--r-- | chart2/workbench/addin/exports.dxp | 1 | ||||
-rw-r--r-- | chart2/workbench/addin/sampleaddin.cxx | 6 | ||||
-rw-r--r-- | chart2/workbench/addin/sampleaddin.def | 1 | ||||
-rw-r--r-- | sc/source/filter/excel/xestream.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/unoobj/appluno.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/detreg.cxx | 7 | ||||
-rw-r--r-- | sc/source/ui/vba/service.cxx | 7 | ||||
-rw-r--r-- | sc/workben/addin.cxx | 6 | ||||
-rw-r--r-- | sc/workben/makefile.mk | 1 | ||||
-rw-r--r-- | scaddins/source/analysis/analysis.cxx | 6 | ||||
-rw-r--r-- | scaddins/source/datefunc/datefunc.cxx | 6 | ||||
-rw-r--r-- | scaddins/source/datefunc/datefunc.def | 1 | ||||
-rw-r--r-- | sccomp/source/solver/solver.cxx | 6 |
18 files changed, 0 insertions, 88 deletions
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx index 40be8ac313fa..c6d9acfca95d 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -102,13 +102,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] = // component exports 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/chart2/source/inc/exports.dxp b/chart2/source/inc/exports.dxp index f0e1c69934bc..70033078921a 100644 --- a/chart2/source/inc/exports.dxp +++ b/chart2/source/inc/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx index 49a0ee73e53c..5b783e95e613 100644 --- a/chart2/source/model/main/_serviceregistration_model.cxx +++ b/chart2/source/model/main/_serviceregistration_model.cxx @@ -185,13 +185,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_model[] = // component exports 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/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx index 6fca1124e594..a2444e171e28 100644 --- a/chart2/source/tools/_serviceregistration_tools.cxx +++ b/chart2/source/tools/_serviceregistration_tools.cxx @@ -177,13 +177,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] = // component exports 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/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index 828564bec31c..f90ea3aa5ee3 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -48,13 +48,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_view[] = // component exports 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/chart2/workbench/addin/exports.dxp b/chart2/workbench/addin/exports.dxp index 9630d7e06768..51703a04666a 100644 --- a/chart2/workbench/addin/exports.dxp +++ b/chart2/workbench/addin/exports.dxp @@ -1,3 +1,2 @@ -component_getImplementationEnvironment component_writeInfo component_getFactory diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx index 2b95474708b1..db7993c607a0 100644 --- a/chart2/workbench/addin/sampleaddin.cxx +++ b/chart2/workbench/addin/sampleaddin.cxx @@ -44,12 +44,6 @@ using ::rtl::OUString; extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) { diff --git a/chart2/workbench/addin/sampleaddin.def b/chart2/workbench/addin/sampleaddin.def index 78cb684a92f3..b13949b6a22b 100644 --- a/chart2/workbench/addin/sampleaddin.def +++ b/chart2/workbench/addin/sampleaddin.def @@ -2,6 +2,5 @@ LIBRARY sampleaddin DESCRIPTION 'Sample Chart AddIn' HEAPSIZE 0 EXPORTS -component_getImplementationEnvironment component_writeInfo component_getFactory diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 0e0514da0dae..d71377c8411c 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -1191,11 +1191,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; -} - // ------------------------ // - component_getFactory - // ------------------------ diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index d9f86d4e5fdf..66b3c7b26cfd 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -186,12 +186,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/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx index 388a652e32eb..02ae0f8d4294 100644 --- a/sc/source/ui/unoobj/detreg.cxx +++ b/sc/source/ui/unoobj/detreg.cxx @@ -43,13 +43,6 @@ using namespace ::com::sun::star::lang; 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/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index 56ed8a38fc6f..e086afa0cfe9 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -78,13 +78,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/sc/workben/addin.cxx b/sc/workben/addin.cxx index d05da70d39af..11b32f3a6735 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -63,12 +63,6 @@ SMART_UNO_IMPLEMENTATION( ScTestAddIn, UsrObject ); extern "C" { -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, registry::XRegistryKey * pRegistryKey ) { diff --git a/sc/workben/makefile.mk b/sc/workben/makefile.mk index ba5ebbbba15e..99005c2250f8 100644 --- a/sc/workben/makefile.mk +++ b/sc/workben/makefile.mk @@ -89,7 +89,6 @@ $(MISC)$/$(SHL1TARGET).def: makefile.mk @echo DATA READ WRITE NONSHARED >>$@ .ENDIF @echo EXPORTS >>$@ - @echo component_getImplementationEnvironment @24 >>$@ @echo component_writeInfo @25 >>$@ @echo component_getFactory @26 >>$@ .ENDIF diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 41183a64c7bd..ee73f616c1a8 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -55,12 +55,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/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index 4ab9d0dacd02..6040f6c1adcb 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -235,12 +235,6 @@ uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( 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/scaddins/source/datefunc/datefunc.def b/scaddins/source/datefunc/datefunc.def index 17573d6f5e44..8fbd938b92ab 100644 --- a/scaddins/source/datefunc/datefunc.def +++ b/scaddins/source/datefunc/datefunc.def @@ -2,5 +2,4 @@ LIBRARY datefunc DESCRIPTION 'StarView 3.00 Uno BE Reflection data 551 ' HEAPSIZE 0 EXPORTS -component_getImplementationEnvironment component_getFactory diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx index 4df8e1b4c34c..a4725411a791 100644 --- a/sccomp/source/solver/solver.cxx +++ b/sccomp/source/solver/solver.cxx @@ -596,12 +596,6 @@ uno::Reference<uno::XInterface> SolverComponent_createInstance( const uno::Refer 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 ) ); |