diff options
Diffstat (limited to 'desktop/source/so_comp/services.cxx')
-rw-r--r-- | desktop/source/so_comp/services.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx index a4709b632f27..c79f36820cb0 100644 --- a/desktop/source/so_comp/services.cxx +++ b/desktop/source/so_comp/services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ static const char* pServices[] = static const char* pImplementations[] = { SOEvaluation::implementationName, - OEMPreloadJob::implementationName, + OEMPreloadJob::implementationName, NULL }; @@ -78,7 +78,7 @@ static const char** pSupportedServices[] = SOEvaluation::interfaces, OEMPreloadJob::interfaces, NULL -}; +}; static Sequence<OUString> getSupportedServiceNames(int p) { @@ -89,26 +89,26 @@ getSupportedServiceNames(int p) { aSeq[i] = OUString::createFromAscii(names[i]); } return aSeq; -} +} extern "C" { -void SAL_CALL +void SAL_CALL component_getImplementationEnvironment( - const sal_Char** ppEnvironmentTypeName, + const sal_Char** ppEnvironmentTypeName, uno_Environment**) { *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } -sal_Bool SAL_CALL +sal_Bool SAL_CALL component_writeInfo( - void* pServiceManager, + void* pServiceManager, void* pRegistryKey) { - Reference<XMultiServiceFactory> xMan( + Reference<XMultiServiceFactory> xMan( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - Reference<XRegistryKey> xKey( + Reference<XRegistryKey> xKey( reinterpret_cast< XRegistryKey* >( pRegistryKey ) ) ; // iterate over service names and register them... @@ -118,7 +118,7 @@ component_writeInfo( for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { pServiceName= pServices[i]; pImplName = pImplementations[i]; - aImpl = OUString::createFromAscii("/") + aImpl = OUString::createFromAscii("/") + OUString::createFromAscii(pImplName) + OUString::createFromAscii("/UNO/SERVICES"); Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl); @@ -127,7 +127,7 @@ component_writeInfo( return sal_True; } -void* SAL_CALL +void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, @@ -137,11 +137,11 @@ component_getFactory( if ( pImplementationName && pServiceManager ) { Reference< XSingleServiceFactory > xFactory; - Reference< XMultiServiceFactory > xServiceManager( + Reference< XMultiServiceFactory > xServiceManager( reinterpret_cast< XMultiServiceFactory* >( pServiceManager ) ) ; - + // search implementation - for (int i = 0; (pImplementations[i]!=NULL); i++) { + for (int i = 0; (pImplementations[i]!=NULL); i++) { if ( strcmp(pImplementations[i], pImplementationName ) == 0 ) { // found implementation xFactory = Reference<XSingleServiceFactory>(cppu::createSingleFactory( |