TL_CONSTASCII_USTRINGPARAM in libs core 18

4 files changed, 58 insertions, 58 deletions

diff --git a/connectivity/workben/iniParser/main.cxx b/connectivity/workben/iniParser/main.cxx
index 683da1e03d85..fa0987b15b89 100644
--- a/connectivity/workben/iniParser/main.cxx
+++ b/connectivity/workben/iniParser/main.cxx
@@ -128,7 +128,7 @@ public:
                         sectionName =  OStringToOUString(
                             line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US );
                         if (!sectionName.getLength())
-                            sectionName = OUString::createFromAscii("no name section");
+                            sectionName = OUString(RTL_CONSTASCII_USTRINGPARAM("no name section"));
 
                         ini_Section *aSection = &mAllSection[sectionName];
                         aSection->sName = sectionName;
@@ -184,7 +184,7 @@ int _cdecl main( int argc, char * argv[] )
 
 {
 
-    IniParser parser(OUString::createFromAscii("test.ini"));
+    IniParser parser(OUString(RTL_CONSTASCII_USTRINGPARAM("test.ini")));
     parser.Dump();
     return 0;
 }
diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx
index cb41137ce3a8..e975c38e0c69 100644
--- a/connectivity/workben/little/main.cxx
+++ b/connectivity/workben/little/main.cxx
@@ -66,25 +66,25 @@ void _cdecl main( int argc, char * argv[] )
 
     try{
         Reference< ::com::sun::star::lang::XMultiServiceFactory > xFac =
-                createRegistryServiceFactory(OUString::createFromAscii("g:\\office50\\program\\applicat.rdb"),OUString());
+                createRegistryServiceFactory(OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\office50\\program\\applicat.rdb")),OUString());
         if(!xFac.is())
             return;
 
-        m_xDriver = Reference<XDriver>(xFac->createInstance(OUString::createFromAscii("com.sun.star.sdbc.driver.dbase.Driver")),UNO_QUERY);
+        m_xDriver = Reference<XDriver>(xFac->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.driver.dbase.Driver"))),UNO_QUERY);
         if(m_xDriver.is())
         {
 
             Sequence<PropertyValue> aValue;
-    //      aValue.getArray()[0] = PropertyValue( OUString::createFromAscii("user"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE);
-    //      aValue.getArray()[1] = PropertyValue( OUString::createFromAscii("password"),0,makeAny(OUString::createFromAscii("TEST1")),PropertyState_DIRECT_VALUE);
+    //      aValue.getArray()[0] = PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("user")),0,makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST1"))),PropertyState_DIRECT_VALUE);
+    //      aValue.getArray()[1] = PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("password")),0,makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("TEST1"))),PropertyState_DIRECT_VALUE);
     //
-            m_xConnection = m_xDriver->connect(OUString::createFromAscii("sdbc:dbase:g:\\"),aValue);
+            m_xConnection = m_xDriver->connect(OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:dbase:g:\\")),aValue);
             if(m_xConnection.is())
             {
                 Reference<XStatement> xStmt = m_xConnection->createStatement();
                 if(xStmt.is())
                 {
-                    Reference<XResultSet> xRes = xStmt->executeQuery(OUString::createFromAscii("SELECT * FROM Tele"));
+                    Reference<XResultSet> xRes = xStmt->executeQuery(OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM Tele")));
                     if(xRes.is())
                     {
                         ::rtl::OUString aPat( RTL_CONSTASCII_USTRINGPARAM( "%s\t" ));
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx
index 390c11a0093e..2fd891b89abf 100644
--- a/connectivity/workben/testmoz/main.cxx
+++ b/connectivity/workben/testmoz/main.cxx
@@ -231,13 +231,13 @@ Reference< XMultiServiceFactory > InitializeFac( void )
                     createRegistryServiceFactory( types, sal_True );
                 Reference< XImplementationRegistration > xIR(
                     interimSmgr->createInstance(
-                        OUString::createFromAscii(
-                            "com.sun.star.registry.ImplementationRegistration" ) ), UNO_QUERY );
+                        OUString::(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.registry.ImplementationRegistration" )) ), UNO_QUERY );
 
                 Reference< XSimpleRegistry > xReg(
                     interimSmgr->createInstance(
-                        OUString::createFromAscii(
-                            "com.sun.star.registry.SimpleRegistry" ) ), UNO_QUERY );
+                        OUString::(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.registry.SimpleRegistry" )) ), UNO_QUERY );
                 if ( xReg.is() )
                 {
                     xReg->open(services, sal_False, sal_True);
@@ -283,12 +283,12 @@ Reference< XMultiServiceFactory > InitializeFac( void )
 
 /*  // Create simple ConfigManager
     Sequence< Any > aConfArgs(3);
-    aConfArgs[0] <<= PropertyValue( OUString::createFromAscii("servertype"), 0, makeAny( OUString::createFromAscii("local") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
-    aConfArgs[1] <<= PropertyValue( OUString::createFromAscii("sourcepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
-    aConfArgs[2] <<= PropertyValue( OUString::createFromAscii("updatepath"), 0, makeAny( OUString::createFromAscii("g:\\") ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
+    aConfArgs[0] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("servertype")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("local")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
+    aConfArgs[1] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("sourcepath")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
+    aConfArgs[2] <<= PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("updatepath")), 0, makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("g:\\")) ), ::com::sun::star::beans::PropertyState_DIRECT_VALUE );
 
     Reference< XContentProvider > xConfProvider
-        ( xSMgr->createInstanceWithArguments( OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), aConfArgs), UNO_QUERY );
+        ( xSMgr->createInstanceWithArguments( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), aConfArgs), UNO_QUERY );
 */
 
 
@@ -301,13 +301,13 @@ Reference< XMultiServiceFactory > InitializeFac( void )
         ucb::ContentBroker::get()->getContentProviderManagerInterface();
 
     Reference< XContentProvider > xFileProvider
-        ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ), UNO_QUERY );
-    xUcb->registerContentProvider( xFileProvider, OUString::createFromAscii( "file" ), sal_True );
+        ( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider")) ), UNO_QUERY );
+    xUcb->registerContentProvider( xFileProvider, OUString(RTL_CONSTASCII_USTRINGPARAM("file")), sal_True );
 
 
 /*  Reference< XContentProvider > xPackageProvider
-        ( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.ucb.PackageContentProvider" ) ), UNO_QUERY );
-    xUcb->registerContentProvider( xPackageProvider, OUString::createFromAscii( "vnd.sun.star.pkg" ), sal_True );
+        ( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.PackageContentProvider")) ), UNO_QUERY );
+    xUcb->registerContentProvider( xPackageProvider, OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.pkg")), sal_True );
     */
     globalUcb = xUcb;
     return xSMgr;
@@ -329,10 +329,10 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
                     printf("Testing getColumns() : START\n");
                     {
                         Reference<XResultSet> xRes = xDmd->getColumns(
-                                makeAny(OUString::createFromAscii("")), // Catalog
-                                OUString::createFromAscii("%"),          // Schema
-                                OUString::createFromAscii("%"),          // TabName
-                                OUString::createFromAscii("%")
+                                makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%"))
                                 );
                         printXResultSets( xRes );
                     }
@@ -348,9 +348,9 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
                 printf("Testing getTables() : START\n");
                     {
                         Reference<XResultSet> xRes = xDmd->getTables(
-                                makeAny(OUString::createFromAscii("")), // Catalog
-                                OUString::createFromAscii("%"),          // Schema
-                                OUString::createFromAscii("%"),          // TabName
+                                makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
                                 Sequence<rtl::OUString>()
                                 );
                         printXResultSets( xRes );
@@ -437,16 +437,16 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
     {
         case -1:
         case 1: //mozilla
-            url=OUString::createFromAscii("sdbc:address:mozilla://");
+            url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://"));
             break;
         case 2:
-            url=OUString::createFromAscii("sdbc:address:ldap://");
+            url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:ldap://"));
             char hostname[40],basedn[40];
             scanf("%s %s",hostname,basedn);
             aValue.realloc(2);
-            aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
+            aValue[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName"));
             aValue[0].Value <<= rtl::OUString::createFromAscii(hostname);
-            aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
+            aValue[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"));
             aValue[1].Value <<= rtl::OUString::createFromAscii(basedn);
             break;
         case 3:
@@ -454,12 +454,12 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
             break;
         case 5:
             //Default LDAP AB
-            url=OUString::createFromAscii("sdbc:address:ldap://");
+            url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:ldap://"));
             aValue.realloc(2);
-            aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
-            aValue[0].Value <<= rtl::OUString::createFromAscii("sun-ds");
-            aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
-            aValue[1].Value <<= rtl::OUString::createFromAscii("dc=sun,dc=com");
+            aValue[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName"));
+            aValue[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sun-ds"));
+            aValue[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"));
+            aValue[1].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dc=sun,dc=com"));
             break;
         default:
             return pConnection;
@@ -676,7 +676,7 @@ int _cdecl main( int argc, char * argv[] )
     {
     Reference< ::com::sun::star::sdbc::XDriver>
     m_xDriver(xMgr->createInstance(
-           OUString::createFromAscii("com.sun.star.comp.sdbc.MozabDriver")),
+           OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.MozabDriver"))),
              UNO_QUERY);
         if(m_xDriver.is())
     {
diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx
index f3a347043e9e..cb01c33a835b 100644
--- a/connectivity/workben/testmoz/mozthread.cxx
+++ b/connectivity/workben/testmoz/mozthread.cxx
@@ -190,10 +190,10 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
         OSL_TRACE("Testing getColumns() : START\n");
         {
             Reference<XResultSet> xRes = xDmd->getColumns(
-                                makeAny(OUString::createFromAscii("")), // Catalog
-                                OUString::createFromAscii("%"),          // Schema
-                                OUString::createFromAscii("%"),          // TabName
-                                OUString::createFromAscii("%")
+                                makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
+                                OUString(RTL_CONSTASCII_USTRINGPARAM("%"))
                                 );
             printXResultSets( xRes );
         }
@@ -209,9 +209,9 @@ int TestMetaData(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
         OSL_TRACE("Testing getTables() : START\n");
          {
             Reference<XResultSet> xRes = xDmd->getTables(
-                    makeAny(OUString::createFromAscii("")), // Catalog
-                    OUString::createFromAscii("%"),          // Schema
-                    OUString::createFromAscii("%"),          // TabName
+                    makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
                     Sequence<rtl::OUString>() );
             printXResultSets( xRes );
         }
@@ -234,7 +234,7 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
         OSL_TRACE(": got statement\n");
         OSL_TRACE(":   excuteQuery() : START \n");
 //      SELECT "First Name", "Display Name", "E-mail" FROM tablename
-        OUString sqlPrefix= OUString::createFromAscii("SELECT  \"First Name\", \"Display Name\", \"E-mail\" FROM ");
+        OUString sqlPrefix(RTL_CONSTASCII_USTRINGPARAM("SELECT  \"First Name\", \"Display Name\", \"E-mail\" FROM "));
         try
         {
             sal_Int32 times=0;
@@ -245,9 +245,9 @@ void TestQuery(Reference< ::com::sun::star::sdbc::XConnection> &pConnection)
                 OUString qut      = xDmd->getIdentifierQuoteString();
 
                 Reference<XResultSet> xRes = xDmd->getTables(
-                    makeAny(OUString::createFromAscii("")), // Catalog
-                    OUString::createFromAscii("%"),          // Schema
-                    OUString::createFromAscii("%"),          // TabName
+                    makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM(""))), // Catalog
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // Schema
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("%")),          // TabName
                         Sequence<rtl::OUString>() );
                 sal_Int32 nTables = 0;
                 while( xRes.is() && xRes->next())
@@ -300,24 +300,24 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
     switch( nIndex)
     {
     case testLDAP:
-        url=OUString::createFromAscii("sdbc:address:ldap://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:ldap://"));
         aValue.realloc(2);
-        aValue[0].Name = ::rtl::OUString::createFromAscii("HostName");
-        aValue[0].Value <<= rtl::OUString::createFromAscii("sun-ds");
-        aValue[1].Name = ::rtl::OUString::createFromAscii("BaseDN");
-        aValue[1].Value <<= rtl::OUString::createFromAscii("dc=sun,dc=com");
+        aValue[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName"));
+        aValue[0].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sun-ds"));
+        aValue[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseDN"));
+        aValue[1].Value <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dc=sun,dc=com"));
         break;
     case testMozilla:
-        url=OUString::createFromAscii("sdbc:address:mozilla://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://"));
         break;
     case testOp:
-        url=OUString::createFromAscii("sdbc:address:outlook://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:outlook://"));
         break;
     case testOe:
-        url=OUString::createFromAscii("sdbc:address:outlookexp://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:outlookexp://"));
         break;
     default:
-        url=OUString::createFromAscii("sdbc:address:mozilla://");
+        url=OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:mozilla://"));
         break;
     }
     pConnection =
@@ -364,7 +364,7 @@ void SAL_CALL mozThread(void*)
     {
         Reference< ::com::sun::star::sdbc::XDriver>
         m_xDriver(mMgr->createInstance(
-           OUString::createFromAscii("com.sun.star.comp.sdbc.MozabDriver")),
+           OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdbc.MozabDriver"))),
              UNO_QUERY);
        if(m_xDriver.is())
         {