From 3a18c3d97abfb60a09cc6a8bd5dd163fe2cfafa3 Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Fri, 10 Dec 2010 18:31:39 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in ure 1 --- remotebridges/examples/officeclient.cxx | 12 ++++++------ remotebridges/source/bridge/remote_bridge.cxx | 12 ++++++------ remotebridges/source/dynamicloader/dynamicloader.cxx | 12 ++++++------ remotebridges/source/factory/bridgefactory.cxx | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) (limited to 'remotebridges') diff --git a/remotebridges/examples/officeclient.cxx b/remotebridges/examples/officeclient.cxx index 92b1469c7ac6..9e01f0fa4445 100644 --- a/remotebridges/examples/officeclient.cxx +++ b/remotebridges/examples/officeclient.cxx @@ -92,7 +92,7 @@ void OfficeClientMain::testWriter( const Reference< XComponent > & rComponent ) Reference< XTextCursor > rCursor = rText->createTextCursor(); Reference< XTextRange > rRange ( rCursor , UNO_QUERY ); - rText->insertString( rRange, OUString::createFromAscii( "This text has been posted by the officeclient component" ), sal_False ); + rText->insertString( rRange, OUString(RTL_CONSTASCII_USTRINGPARAM("This text has been posted by the officeclient component")), sal_False ); } /******************** @@ -105,7 +105,7 @@ void OfficeClientMain::registerServices( ) Reference < XImplementationRegistration > rImplementationRegistration( m_xSMgr->createInstance( - OUString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" )), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration"))), UNO_QUERY ); if( ! rImplementationRegistration.is() ) @@ -135,7 +135,7 @@ void OfficeClientMain::registerServices( ) { // register the needed services in the servicemanager rImplementationRegistration->registerImplementation( - OUString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")), aDllName, Reference< XSimpleRegistry > () ); } @@ -156,7 +156,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw try { registerServices(); Reference < XInterface > r = - m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.bridge.UnoUrlResolver" ) ); + m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) ); Reference < XUnoUrlResolver > rResolver( r , UNO_QUERY ); r = rResolver->resolve( aArguments.getConstArray()[0] ); @@ -165,7 +165,7 @@ sal_Int32 OfficeClientMain::run( const Sequence< OUString > & aArguments ) throw { printf( "got the remote NamingService\n" ); - r = rNamingService->getRegisteredObject(OUString::createFromAscii("StarOffice.ServiceManager")); + r = rNamingService->getRegisteredObject(OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager"))); Reference< XMultiServiceFactory > rRemoteSMgr( r , UNO_QUERY ); @@ -262,7 +262,7 @@ Sequence< OUString > getSupportedServiceNames() if( !pNames ) { static Sequence< OUString > seqNames(2); - seqNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.bridge.example.OfficeClientExample" ); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.example.OfficeClientExample")); pNames = &seqNames; } } diff --git a/remotebridges/source/bridge/remote_bridge.cxx b/remotebridges/source/bridge/remote_bridge.cxx index f63a418c3d50..ac6d5a2770ee 100644 --- a/remotebridges/source/bridge/remote_bridge.cxx +++ b/remotebridges/source/bridge/remote_bridge.cxx @@ -109,7 +109,7 @@ namespace remotebridges_bridge if( 4 != aArguments.getLength() ) { - throw IllegalArgumentException( rtl::OUString::createFromAscii("wrong number of arguments") , + throw IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wrong number of arguments")) , Reference< XInterface >(), 0 ); } @@ -126,7 +126,7 @@ namespace remotebridges_bridge if( ! rConnection.is() ) { - throw IllegalArgumentException( rtl::OUString::createFromAscii("connection is missing") , + throw IllegalArgumentException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("connection is missing")) , Reference < XInterface > (), 2 ); } @@ -187,7 +187,7 @@ namespace remotebridges_bridge m_pContext = 0; // forgotten exception when specifying the interface - throw RuntimeException( rtl::OUString::createFromAscii("couldn't create uno-remote-environment") , + throw RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("couldn't create uno-remote-environment")) , Reference < XInterface > () ); } } @@ -418,9 +418,9 @@ namespace remotebridges_bridge if( !pNames ) { static Sequence< OUString > seqNames(3); - seqNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.bridge.Bridge" ); - seqNames.getArray()[1] = OUString::createFromAscii( "com.sun.star.bridge.IiopBridge" ); - seqNames.getArray()[2] = OUString::createFromAscii( "com.sun.star.bridge.UrpBridge" ); + seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge")); + seqNames.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.IiopBridge")); + seqNames.getArray()[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UrpBridge")); pNames = &seqNames; } diff --git a/remotebridges/source/dynamicloader/dynamicloader.cxx b/remotebridges/source/dynamicloader/dynamicloader.cxx index 93b7a3b0329c..cc656662fb17 100644 --- a/remotebridges/source/dynamicloader/dynamicloader.cxx +++ b/remotebridges/source/dynamicloader/dynamicloader.cxx @@ -150,8 +150,8 @@ namespace dynamic_loader { const OUString& locationUrl) throw(CannotRegisterImplementationException, RuntimeException); }; - const OUString DynamicLoader::implname = OUString::createFromAscii("com.sun.star.comp.stoc.DynamicLoader"); - const OUString DynamicLoader::servname = OUString::createFromAscii("com.sun.star.loader.Dynamic"); + const OUString DynamicLoader::implname (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.DynamicLoader")); + const OUString DynamicLoader::servname (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.Dynamic")); Sequence SAL_CALL DynamicLoader::getSupportedServiceNames_Static() throw() { return Sequence(&servname, 1); @@ -332,11 +332,11 @@ namespace dynamic_loader { } // create the keys - OUString keyName = OUString::createFromAscii("/"); + OUString keyName (RTL_CONSTASCII_USTRINGPARAM("/")); keyName += implementationLoaderUrl; keyName += OUString(RTL_CONSTASCII_USTRINGPARAM("_")); keyName += serviceName; - keyName += OUString::createFromAscii("/UNO/SERVICES"); + keyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); Reference xNewKey(xKey->createKey(keyName)); xNewKey->createKey(serviceName); @@ -387,9 +387,9 @@ extern "C" { if (pRegistryKey) { try { - OUString x = OUString::createFromAscii("/"); + OUString x (RTL_CONSTASCII_USTRINGPARAM("/")); x += ::dynamic_loader::DynamicLoader::implname; - x += OUString::createFromAscii("/UNO/SERVICES"); + x += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); Reference xNewKey(pRegistryKey->createKey(x)); diff --git a/remotebridges/source/factory/bridgefactory.cxx b/remotebridges/source/factory/bridgefactory.cxx index cc56cbf1d5db..a52ac0bea2f1 100644 --- a/remotebridges/source/factory/bridgefactory.cxx +++ b/remotebridges/source/factory/bridgefactory.cxx @@ -240,7 +240,7 @@ namespace remotebridges_factory else { // fallback to the old solution, deprecated, should be removed ! - sService = OUString::createFromAscii( "com.sun.star.bridge.Bridge." ); + sService = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge.")); sService += sProtocolName; } return sService; -- cgit