diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-10 18:54:29 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-12-10 18:54:29 +0100 |
commit | 2d8048e56bb3c630b6e39486683d5b08db510948 (patch) | |
tree | 86d7da3fd30e80b2c692a8d3a7ce8b6a2e06bab3 | |
parent | 8b9849322b31f40e05e39475b39af616c71b1086 (diff) |
RTL_CONSTASCII_USTRINGPARAM in ure 2
-rw-r--r-- | io/test/testconnection.cxx | 4 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 2 | ||||
-rw-r--r-- | remotebridges/examples/officeclient.cxx | 10 | ||||
-rw-r--r-- | remotebridges/source/factory/bridgefactory.cxx | 2 | ||||
-rw-r--r-- | store/workben/t_store.cxx | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx index 400f339ca..fe06374f7 100644 --- a/io/test/testconnection.cxx +++ b/io/test/testconnection.cxx @@ -193,11 +193,11 @@ int __cdecl main( int argc, char * argv[] ) OSL_ENSURE( xImplReg.is(), "### no impl reg!" ); OUString aLibName = - OUString::createFromAscii( "connector.uno" SAL_DLLEXTENSION ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "connector.uno" SAL_DLLEXTENSION )); xImplReg->registerImplementation( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aLibName, Reference< XSimpleRegistry >() ); - aLibName = OUString::createFromAscii( "acceptor.uno" SAL_DLLEXTENSION ); + aLibName = OUString(RTL_CONSTASCII_USTRINGPARAM( "acceptor.uno" SAL_DLLEXTENSION )); xImplReg->registerImplementation( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aLibName, Reference< XSimpleRegistry >() ); diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 326bd4f6b..355056bbc 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -177,7 +177,7 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) reinterpret_cast< oslGenericFunction >(readLoggingConfig), (rtl_uString **) &fileName ); fileName = OUString( fileName.getStr(), fileName.lastIndexOf( '/' )+1 ); - fileName += OUString::createFromAscii( SAL_CONFIGFILE("pyuno") ); + fileName += OUString(RTL_CONSTASCII_USTRINGPARAM( SAL_CONFIGFILE("pyuno") )); rtl::Bootstrap bootstrapHandle( fileName ); OUString str; diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index aa48af98a..459f78877 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -116,13 +116,13 @@ void OfficeClientMain::registerServices( ) OUString aSharedLibrary[4]; aSharedLibrary[0] = - OUString::createFromAscii( "connector.uno" SAL_DLLEXTENSION ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "connector.uno" SAL_DLLEXTENSION )); aSharedLibrary[1] = - OUString::createFromAscii( "remotebridge.uno" SAL_DLLEXTENSION ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "remotebridge.uno" SAL_DLLEXTENSION )); aSharedLibrary[2] = - OUString::createFromAscii( "bridgefac.uno" SAL_DLLEXTENSION ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "bridgefac.uno" SAL_DLLEXTENSION )); aSharedLibrary[3] = - OUString::createFromAscii( "uuresolver.uno" SAL_DLLEXTENSION ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "uuresolver.uno" SAL_DLLEXTENSION )); sal_Int32 i; for( i = 0 ; i < 4 ; i ++ ) @@ -293,7 +293,7 @@ sal_Bool SAL_CALL component_writeInfo( { Reference< XRegistryKey > xNewKey( reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( - OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) ); const Sequence< OUString > & rSNL = getSupportedServiceNames(); const OUString * pArray = rSNL.getConstArray(); diff --git a/remotebridges/source/factory/bridgefactory.cxx b/remotebridges/source/factory/bridgefactory.cxx index ec304207d..9f361773d 100644 --- a/remotebridges/source/factory/bridgefactory.cxx +++ b/remotebridges/source/factory/bridgefactory.cxx @@ -419,7 +419,7 @@ namespace remotebridges_factory if( !pNames ) { static Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString::createFromAscii( SERVICE_NAME ); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME )); pNames = &seqNames; } } diff --git a/store/workben/t_store.cxx b/store/workben/t_store.cxx index 3b67bb199..3e863be55 100644 --- a/store/workben/t_store.cxx +++ b/store/workben/t_store.cxx @@ -370,7 +370,7 @@ int SAL_CALL main (int argc, char **argv) { OUString aName (RTL_CONSTASCII_USTRINGPARAM("demostor-")); aName += OUString::valueOf ((sal_Int32)(i + 1), 10); - aName += OUString::createFromAscii (".dat"); + aName += OUString(RTL_CONSTASCII_USTRINGPARAM (".dat")); #if (_DEMOSTOR_REMOVE == 1) eErrCode = aFile.remove (aPath, aName); |