diff options
| author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-08 15:14:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-08 15:17:22 +0000 |
| commit | b931cb786415877ac15813927a55dd36cbebd8cd (patch) | |
| tree | 1abc96c8c19193d5e0e343c13902b77d29b8114c /desktop/source/splash | |
| parent | 17a2466f6be4dde82461a9f593b6bb2be4f644f9 (diff) | |
use RTL_CONSTASCII_USTRINGPARAM
Diffstat (limited to 'desktop/source/splash')
| -rw-r--r-- | desktop/source/splash/services_spl.cxx | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx index adcf9c1a5f..b63f89792a 100644 --- a/desktop/source/splash/services_spl.cxx +++ b/desktop/source/splash/services_spl.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 @@ -37,7 +37,6 @@ #include "splash.hxx" - using namespace rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -65,12 +64,11 @@ static const fProvider pInstanceProviders[] = NULL }; - static const char** pSupportedServices[] = { SplashScreen::interfaces, NULL -}; +}; static Sequence<OUString> getSupportedServiceNames(int p) { @@ -81,26 +79,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... @@ -110,16 +108,16 @@ component_writeInfo( for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) { pServiceName= pServices[i]; pImplName = pImplementations[i]; - aImpl = OUString::createFromAscii("/") + aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + OUString::createFromAscii(pImplName) - + OUString::createFromAscii("/UNO/SERVICES"); + + OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl); xNewKey->createKey(OUString::createFromAscii(pServiceName)); } return sal_True; } -void* SAL_CALL +void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, @@ -129,11 +127,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( |