Kaydet (Commit) bc925cc2 authored tarafından Matus Kukan's avatar Matus Kukan Kaydeden (comit) Matúš Kukan

Remove component_getImplementationEnvironment

üst 7efec84c
...@@ -102,13 +102,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] = ...@@ -102,13 +102,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
// component exports // component exports
extern "C" 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( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
......
component_getImplementationEnvironment
component_getFactory component_getFactory
...@@ -185,13 +185,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_model[] = ...@@ -185,13 +185,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_model[] =
// component exports // component exports
extern "C" 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( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
......
...@@ -177,13 +177,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] = ...@@ -177,13 +177,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_tools[] =
// component exports // component exports
extern "C" 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( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
......
...@@ -48,13 +48,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_view[] = ...@@ -48,13 +48,6 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_view[] =
// component exports // component exports
extern "C" 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( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {
......
component_getImplementationEnvironment
component_writeInfo component_writeInfo
component_getFactory component_getFactory
...@@ -44,12 +44,6 @@ using ::rtl::OUString; ...@@ -44,12 +44,6 @@ using ::rtl::OUString;
extern "C" { 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( sal_Bool SAL_CALL component_writeInfo(
void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey ) void * /*pServiceManager*/, registry::XRegistryKey * pRegistryKey )
{ {
......
...@@ -2,6 +2,5 @@ LIBRARY sampleaddin ...@@ -2,6 +2,5 @@ LIBRARY sampleaddin
DESCRIPTION 'Sample Chart AddIn' DESCRIPTION 'Sample Chart AddIn'
HEAPSIZE 0 HEAPSIZE 0
EXPORTS EXPORTS
component_getImplementationEnvironment
component_writeInfo component_writeInfo
component_getFactory component_getFactory
...@@ -1191,11 +1191,6 @@ extern "C" ...@@ -1191,11 +1191,6 @@ extern "C"
{ {
#endif #endif
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
// ------------------------ // ------------------------
// - component_getFactory - // - component_getFactory -
// ------------------------ // ------------------------
......
...@@ -186,12 +186,6 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD ...@@ -186,12 +186,6 @@ SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREAD
extern "C" { 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( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ ) const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{ {
......
...@@ -43,13 +43,6 @@ using namespace ::com::sun::star::lang; ...@@ -43,13 +43,6 @@ using namespace ::com::sun::star::lang;
extern "C" { 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, SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager, void* pServiceManager,
void* /* pRegistryKey */ ) void* /* pRegistryKey */ )
......
...@@ -78,13 +78,6 @@ extern sdecl::ServiceDecl const serviceDecl; ...@@ -78,13 +78,6 @@ extern sdecl::ServiceDecl const serviceDecl;
extern "C" 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( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager, const sal_Char * pImplName, lang::XMultiServiceFactory * pServiceManager,
registry::XRegistryKey * pRegistryKey ) registry::XRegistryKey * pRegistryKey )
......
...@@ -63,12 +63,6 @@ SMART_UNO_IMPLEMENTATION( ScTestAddIn, UsrObject ); ...@@ -63,12 +63,6 @@ SMART_UNO_IMPLEMENTATION( ScTestAddIn, UsrObject );
extern "C" { 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( sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, registry::XRegistryKey * pRegistryKey ) void * pServiceManager, registry::XRegistryKey * pRegistryKey )
{ {
......
...@@ -89,7 +89,6 @@ $(MISC)$/$(SHL1TARGET).def: makefile.mk ...@@ -89,7 +89,6 @@ $(MISC)$/$(SHL1TARGET).def: makefile.mk
@echo DATA READ WRITE NONSHARED >>$@ @echo DATA READ WRITE NONSHARED >>$@
.ENDIF .ENDIF
@echo EXPORTS >>$@ @echo EXPORTS >>$@
@echo component_getImplementationEnvironment @24 >>$@
@echo component_writeInfo @25 >>$@ @echo component_writeInfo @25 >>$@
@echo component_getFactory @26 >>$@ @echo component_getFactory @26 >>$@
.ENDIF .ENDIF
......
...@@ -55,12 +55,6 @@ using namespace ::com::sun::star; ...@@ -55,12 +55,6 @@ using namespace ::com::sun::star;
extern "C" { 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*/ ) SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{ {
void* pRet = 0; void* pRet = 0;
......
...@@ -235,12 +235,6 @@ uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( ...@@ -235,12 +235,6 @@ uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance(
extern "C" { 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( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
......
...@@ -2,5 +2,4 @@ LIBRARY datefunc ...@@ -2,5 +2,4 @@ LIBRARY datefunc
DESCRIPTION 'StarView 3.00 Uno BE Reflection data 551 ' DESCRIPTION 'StarView 3.00 Uno BE Reflection data 551 '
HEAPSIZE 0 HEAPSIZE 0
EXPORTS EXPORTS
component_getImplementationEnvironment
component_getFactory component_getFactory
...@@ -596,12 +596,6 @@ uno::Reference<uno::XInterface> SolverComponent_createInstance( const uno::Refer ...@@ -596,12 +596,6 @@ uno::Reference<uno::XInterface> SolverComponent_createInstance( const uno::Refer
extern "C" 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*/ ) SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{ {
OUString aImplName( OUString::createFromAscii( pImplName ) ); OUString aImplName( OUString::createFromAscii( pImplName ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment