RTL_CONSTASCII_USTRINGPARAM in ure 3

7 files changed, 15 insertions, 15 deletions

diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index e4e9f22c5c8f..3c98bb74ef65 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -1029,23 +1029,23 @@ SAL_IMPLEMENT_MAIN()
 
         xImplReg->registerImplementation(
             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
-            OUString::createFromAscii("invocadapt.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invocadapt.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
         xImplReg->registerImplementation(
             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
-            OUString::createFromAscii("stocservices.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
         xImplReg->registerImplementation(
             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
-            OUString::createFromAscii("invocation.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invocation.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
         xImplReg->registerImplementation(
             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
-            OUString::createFromAscii("reflection.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("reflection.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
         xImplReg->registerImplementation(
             OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
-            OUString::createFromAscii("introspection.uno" SAL_DLLEXTENSION),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("introspection.uno" SAL_DLLEXTENSION)),
             Reference< XSimpleRegistry >() );
 
         if (test_adapter( xMgr ))
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 3a905c376f73..df204f50a96d 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1565,8 +1565,8 @@ SAL_IMPLEMENT_MAIN()
         OSL_ENSURE( xRefl.is(), "### no corereflection!" );
 
         // Introspection
-        libName = OUString::createFromAscii(
-            "introspection.uno" SAL_DLLEXTENSION);
+        libName = OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "introspection.uno" SAL_DLLEXTENSION));
 //          ORealDynamicLoader::computeLibraryName( OUString(RTL_CONSTASCII_USTRINGPARAM("insp")), libName);
         fprintf(stderr, "3\n" );
         xImplReg->registerImplementation(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index b2b23afc82e7..902aaf633200 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -91,7 +91,7 @@ SAL_IMPLEMENT_MAIN()
     {
         // try to get provider from module
         component_getFactoryFunc pCompFactoryFunc = (component_getFactoryFunc)
-            module.getFunctionSymbol( OUString::createFromAscii(COMPONENT_GETFACTORY) );
+            module.getFunctionSymbol( OUString(RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY)) );
 
         if (pCompFactoryFunc)
         {
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index b5cf33c8739e..991eff6b6a3e 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -284,8 +284,8 @@ SAL_IMPLEMENT_MAIN()
 
             Reference< reflection::XProxyFactory > xProxyFac(
                 xMgr->createInstance(
-                    OUString::createFromAscii(
-                        "com.sun.star.reflection.ProxyFactory") ),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM(
+                        "com.sun.star.reflection.ProxyFactory")) ),
                 UNO_QUERY_THROW );
 
             Reference< XAggregation > x(
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index bf1b55027482..9eacc563f8f3 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -174,7 +174,7 @@ void test_SimpleRegistry(
     {
         // try to get provider from module
         component_getFactoryFunc pCompFactoryFunc = (component_getFactoryFunc)
-            module.getFunctionSymbol( OUString::createFromAscii(COMPONENT_GETFACTORY) );
+            module.getFunctionSymbol( OUString(RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY)) );
 
         if (pCompFactoryFunc)
         {
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index e57a065a90f0..45cdfb3d2ce8 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -150,7 +150,7 @@ Reference < XInterface > SAL_CALL Test_Manager_Impl_CreateInstance(
 //
 OUString Test_Manager_Impl::getImplementationName() throw()
 {
-    return OUString::createFromAscii(IMPLEMENTATION_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLEMENTATION_NAME));
 }
 
 //*************************************************************************
@@ -180,7 +180,7 @@ Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames(void) throw ()
 Sequence< OUString > Test_Manager_Impl::getSupportedServiceNames_Static(void) throw ()
 {
     Sequence< OUString > aSNS( 2 );
-    aSNS.getArray()[0] = OUString::createFromAscii(SERVICE_NAME);
+    aSNS.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICE_NAME));
     aSNS.getArray()[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.Bridge"));
     return aSNS;
 }
@@ -330,7 +330,7 @@ extern "C" void SAL_CALL test_ServiceManager()
     {
         Reference< XServiceProvider > xSiSP1(createSingleFactory(
             xSMgr,
-            OUString::createFromAscii("com::sun::star.usr.Test_Manager_Impl1),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com::sun::star.usr.Test_Manager_Impl1)),
             Test_Manager_Impl_CreateInstance,
             Test_Manager_Impl::getSupportedServiceNames_Static() ), UNO_QUERY);
         Reference< XServiceProvider > xSiSP11(createSingleFactory(
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index 41b29bba1105..34ac40b504de 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -276,7 +276,7 @@ void Test::testParse() {
                 uriRef->getPathSegment(4));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), uriRef->getPathSegment(5));
+                rtl::OUString(), uriRef->getPathSegment(5));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
                 data[i].query != 0, uriRef->hasQuery());