RTL_CONSTASCII_USTRINGPARAM in ure 1

author: Gert Faller <gertfaller@aliceadsl.fr> 2010-12-10 18:31:39 +0100
committer: Gert Faller <gertfaller@aliceadsl.fr> 2010-12-10 18:31:39 +0100
commit: 3a18c3d97abfb60a09cc6a8bd5dd163fe2cfafa3 (patch)
tree: 02ef980b5d6440ebbacf6f8801bea9d27f62b7a5 /sal
parent: 377a56fb1b9825ec5dc71ba9ae81b6e27cfabffb (diff)
35 files changed, 558 insertions, 558 deletions
diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx
index 7430f0a4c3b7..2e2640378973 100644
--- a/sal/osl/os2/file.cxx
+++ b/sal/osl/os2/file.cxx
@@ -567,7 +567,7 @@ oslFileError SAL_CALL osl_getDirectoryItem( rtl_uString* ustrFileURL, oslDirecto
 
                 if ( pItemImpl->ustrDrive->buffer[pItemImpl->ustrDrive->length-1] != sal_Unicode('\\') )
                     rtl_uString_newConcat( &pItemImpl->ustrDrive,
-                                            pItemImpl->ustrDrive, rtl::OUString::createFromAscii( "\\" ).pData);
+                                            pItemImpl->ustrDrive, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\")).pData);
 
                 *pItem = pItemImpl;
             }
diff --git a/sal/osl/os2/file_path_helper.cxx b/sal/osl/os2/file_path_helper.cxx
index 8402da30a606..33a370de028a 100644
--- a/sal/osl/os2/file_path_helper.cxx
+++ b/sal/osl/os2/file_path_helper.cxx
@@ -63,11 +63,11 @@
   const sal_Unicode FPH_CHAR_COLON          = (sal_Unicode)':';
 
   inline const rtl::OUString FPH_PATH_SEPARATOR()
-      { return rtl::OUString::createFromAscii("\\"); }
+      { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\")); }
   inline const rtl::OUString FPH_LOCAL_DIR_ENTRY()
-      { return rtl::OUString::createFromAscii("."); }
+      { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); }
   inline const rtl::OUString FPH_PARENT_DIR_ENTRY()
-      { return rtl::OUString::createFromAscii(".."); }
+      { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")); }
 
  /*******************************************
   *  osl_systemPathRemoveSeparator
diff --git a/sal/osl/os2/file_url.cxx b/sal/osl/os2/file_url.cxx
index 395cfea13e41..966f31cecab0 100644
--- a/sal/osl/os2/file_url.cxx
+++ b/sal/osl/os2/file_url.cxx
@@ -890,7 +890,7 @@ namespace /* private */
     bool find_in_PATH(const rtl::OUString& file_path, rtl::OUString& result)
     {
         bool          bfound = false;
-        rtl::OUString path   = rtl::OUString::createFromAscii("PATH");
+        rtl::OUString path(RTL_CONSTASCII_USTRINGPARAM("PATH"));
         rtl::OUString env_path;
 
         if (osl_Process_E_None == osl_getEnvironment(path.pData, &env_path.pData))
diff --git a/sal/osl/os2/path_helper.cxx b/sal/osl/os2/path_helper.cxx
index f433e79201f2..bc5e0039aaa6 100644
--- a/sal/osl/os2/path_helper.cxx
+++ b/sal/osl/os2/path_helper.cxx
@@ -42,8 +42,8 @@
  Constants
  ******************************************************************/
 
-const rtl::OUString BACKSLASH = rtl::OUString::createFromAscii("\\");
-const rtl::OUString SLASH     = rtl::OUString::createFromAscii("/");
+const rtl::OUString BACKSLASH (RTL_CONSTASCII_USTRINGPARAM("\\"));
+const rtl::OUString SLASH     (RTL_CONSTASCII_USTRINGPARAM("/"));
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
diff --git a/sal/osl/w32/path_helper.cxx b/sal/osl/w32/path_helper.cxx
index 3edf3d48aafb..aaf59f4ef586 100644
--- a/sal/osl/w32/path_helper.cxx
+++ b/sal/osl/w32/path_helper.cxx
@@ -44,8 +44,8 @@
  Constants
  ******************************************************************/
 
-const rtl::OUString BACKSLASH = rtl::OUString::createFromAscii("\\");
-const rtl::OUString SLASH     = rtl::OUString::createFromAscii("/");
+const rtl::OUString BACKSLASH (RTL_CONSTASCII_USTRINGPARAM("\\"));
+const rtl::OUString SLASH     (RTL_CONSTASCII_USTRINGPARAM("/"));
 
 /*******************************************************************
  osl_systemPathEnsureSeparator
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 24918fd5060c..313fd0ec736b 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -62,7 +62,7 @@ extern "C" oslFileHandle SAL_CALL osl_createFileHandleFromOSHandle( HANDLE hFile
 //#################################################
 const sal_Unicode NAME_VALUE_SEPARATOR = TEXT('=');
 const sal_Char* SPACE = " ";
-const rtl::OUString ENV_COMSPEC = rtl::OUString::createFromAscii("COMSPEC");
+const rtl::OUString ENV_COMSPEC (RTL_CONSTASCII_USTRINGPARAM("COMSPEC"));
 const rtl::OUString QUOTE = rtl::OUString::createFromAscii("\"");
 
 namespace /* private */
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 276ee03626c6..4b02edb332f4 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -105,9 +105,9 @@ inline ::rtl::OString errorToString( const ::osl::FileBase::RC _nError )
 rtl::OUString errorToStr( ::osl::FileBase::RC const& nError)
 {
     rtl::OUStringBuffer suBuf;
-    suBuf.append( rtl::OUString::createFromAscii("The returned error is: ") );
+    suBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The returned error is: ")) );
     suBuf.append( rtl::OStringToOUString(errorToString(nError), RTL_TEXTENCODING_ASCII_US) );
-    suBuf.append( rtl::OUString::createFromAscii("!\n") );
+    suBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!\n")) );
     return suBuf.makeStringAndClear();
 }
 
@@ -491,7 +491,7 @@ inline void deleteTestDirectory( const ::rtl::OUString dirname )
     // LLA: {
     // LLA:     // t_print("nError == %d\n", nError);
     // LLA: }
-        rtl::OUString strError = rtl::OUString::createFromAscii( "In deleteTestDirectory function: remove Directory ");
+        rtl::OUString strError (RTL_CONSTASCII_USTRINGPARAM("In deleteTestDirectory function: remove Directory "));
         strError += aPathURL;
     CPPUNIT_ASSERT_MESSAGE( strError, ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );
     // LLA: if (! ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ))
@@ -679,11 +679,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r
     if ( returnVal.equals( rightVal ) )
         return aUString;
     aUString += ::rtl::OUString::createFromAscii(msg);
-    aUString += ::rtl::OUString::createFromAscii(": the returned value is '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '"));
     aUString += returnVal;
-    aUString += ::rtl::OUString::createFromAscii("', but the value should be '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '"));
     aUString += rightVal;
-    aUString += ::rtl::OUString::createFromAscii("'.");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
     return aUString;
 }
 
@@ -784,52 +784,52 @@ namespace osl_FileBase
 
   void getAbsoluteFileURL::getAbsoluteFileURL_001_1()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/file1") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/file1")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "relative/file1",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_2()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/file2") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/file2")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "relative/./file2",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_3()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/file3") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/file3")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "relative/../file3",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_4()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/file4") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/file4")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/../file4",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_5()
   {
     rtl::OUString suAssume;
 #if ( defined UNX )
-    suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative/") );
+    suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative/")) );
 #else
-    suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/relative") );
+    suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/relative")) );
 #endif
     check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/.",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_6()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.relative") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.relative")) );
     check_getAbsoluteFileURL( aUserDirectoryURL, "./.relative",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_7()
   {
     rtl::OUString suAssume;
 #if (defined UNX )
-    suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.a/") );
+    suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.a/")) );
 #else //windows
-    suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/.a") );
+    suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/.a")) );
 #endif
     check_getAbsoluteFileURL( aUserDirectoryURL, "./.a/mydir/..",::osl::FileBase::E_None, suAssume );
   }
   void getAbsoluteFileURL::getAbsoluteFileURL_001_8()
   {
-    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/tmp/ok") );
+    rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp/ok")) );
 #if ( defined UNX ) || ( defined OS2 )
     check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",::osl::FileBase::E_None, suAssume );
 #else
@@ -840,8 +840,8 @@ namespace osl_FileBase
   {
 #if ( defined UNX ) || ( defined OS2 )      //Link is not defined in Windows
         ::rtl::OUString aUStr_AbsURL, aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-        ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/link.file");
-        ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/canonical.name");
+        ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/link.file"));
+        ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/canonical.name"));
 
                 rtl::OString strLinkFileName, strSrcFileName;
                 strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
@@ -851,7 +851,7 @@ namespace osl_FileBase
                 sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
         CPPUNIT_ASSERT( fd == 0 );
         rtl::OString sLnkURL = OUStringToOString( aLnkURL1, RTL_TEXTENCODING_ASCII_US );
-            rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString::createFromAscii("/canonical.name") );
+            rtl::OUString suAssume = aUserDirectoryURL.concat( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/canonical.name")) );
         check_getAbsoluteFileURL( aUserDirectoryURL, sLnkURL, ::osl::FileBase::E_None, suAssume );
         deleteTestFile( aCanURL1 );
                 fd = remove( strLinkFileName.getStr() );
@@ -865,12 +865,12 @@ namespace osl_FileBase
     void getAbsoluteFileURL::getAbsoluteFileURL_004()
     {
         //create two level directories under $Temp/PID/
-        ::rtl::OUString aUStrUpBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1");
+        ::rtl::OUString aUStrUpBase = aUserDirectoryURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test1"));
         createTestDirectory( aUStrUpBase );
-        ::rtl::OUString aUStrBase = aUserDirectoryURL + ::rtl::OUString::createFromAscii("/test1/dir1");
+        ::rtl::OUString aUStrBase = aUserDirectoryURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test1/dir1"));
         createTestDirectory( aUStrBase );
 
-        ::rtl::OUString suAssume = aUserDirectoryURL.concat( ::rtl::OUString::createFromAscii("/mytestfile") );
+        ::rtl::OUString suAssume = aUserDirectoryURL.concat( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/mytestfile")) );
         check_getAbsoluteFileURL( aUStrBase, "../../mytestfile" , ::osl::FileBase::E_None, suAssume );
         deleteTestDirectory( aUStrBase );
         deleteTestDirectory( aUStrUpBase );
@@ -1229,9 +1229,9 @@ namespace osl_FileBase
 
             sal_Bool bOk = compareFileName( aUStr, aResultURL );
 
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getSystemPathFromFileURL(' ");
+            ::rtl::OUString suError(RTL_CONSTASCII_USTRINGPARAM("test for getSystemPathFromFileURL(' "));
             suError += aNormalURL;
-            suError += ::rtl::OUString::createFromAscii(" ') function:use an absolute file URL, ");
+            suError += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ') function:use an absolute file URL, "));
             suError += outputError(aUStr, aResultURL);
 
             CPPUNIT_ASSERT_MESSAGE( suError, ( osl::FileBase::E_None == nError ) && ( sal_True == bOk ) );
@@ -1250,9 +1250,9 @@ namespace osl_FileBase
 
             sal_Bool bOk = compareFileName( aUStr, aResultURL );
 
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for getSystemPathFromFileURL(' ");
+            ::rtl::OUString suError(RTL_CONSTASCII_USTRINGPARAM("test for getSystemPathFromFileURL(' "));
             suError += aNormalURL;
-            suError += ::rtl::OUString::createFromAscii(" ') function:use a CJK coded absolute URL, ");
+            suError += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ') function:use a CJK coded absolute URL, "));
             suError += outputError(aUStr, aResultURL);
             deleteTestDirectory( aTmpName10 );
 
@@ -2652,8 +2652,8 @@ namespace osl_FileStatus
             sal_Int32 fd;
 
             ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/link.file");
-            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/tmpname");
+            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/link.file"));
+            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/tmpname"));
 
                 rtl::OString strLinkFileName;
                 rtl::OString strSrcFileName;
@@ -2667,7 +2667,7 @@ namespace osl_FileStatus
             // testDirectory is "/tmp/PID/tmpdir/"
             ::osl::Directory testDirectory( aTmpName3 );
                 ::osl::FileBase::RC nError1 = testDirectory.open( );
-            ::rtl::OUString aFileName = ::rtl::OUString::createFromAscii("link.file");
+            ::rtl::OUString aFileName (RTL_CONSTASCII_USTRINGPARAM("link.file"));
             sal_Bool bOk = sal_False;
             while (1) {
                 nError1 = testDirectory.getNextItem( rItem_link, 4 );
@@ -2839,7 +2839,7 @@ namespace osl_FileStatus
 // LLA:         {
 // LLA: #if defined ( SOLARIS ) //Socket file may differ in Windows
 // LLA:             // nError1 = ::osl::DirectoryItem::get( aTypeURL1, m_aSocketItem );
-// LLA:             nError1 = ::osl::DirectoryItem::get( rtl::OUString::createFromAscii("/dev/null"), m_aSocketItem );
+// LLA:             nError1 = ::osl::DirectoryItem::get( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/dev/null")), m_aSocketItem );
 // LLA:             printError(nError1);
 // LLA:             CPPUNIT_ASSERT_MESSAGE("get Socket type file failed", ::osl::FileBase::E_None == nError1 );
 // LLA:
@@ -3019,7 +3019,7 @@ namespace osl_FileStatus
 #else                                    //Windows version
         void getAttributes_004( )
         {
-            ::rtl::OUString aUserHiddenFileURL = ::rtl::OUString::createFromAscii("file:///c:/AUTOEXEC.BAT");
+            ::rtl::OUString aUserHiddenFileURL (RTL_CONSTASCII_USTRINGPARAM("file:///c:/AUTOEXEC.BAT"));
             nError = ::osl::DirectoryItem::get( aUserHiddenFileURL, rItem_hidden );
             //printFileName( aUserHiddenFileURL );
             CPPUNIT_ASSERT_MESSAGE("get item fail", nError == FileBase::E_None );
@@ -3328,8 +3328,8 @@ namespace osl_FileStatus
         {
             //create a link file;
             ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/link.file");
-            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpname");
+            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/link.file"));
+            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname"));
 
                 rtl::OString strLinkFileName, strSrcFileName;
                 strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
@@ -4516,10 +4516,10 @@ namespace osl_File
         //create directory $TEMP/tmpname/tmpdir
         createTestDirectory( aTmpName8 );
         //move directory $TEMP/tmpname to $TEMP/tmpname/tmpdir/tmpname
-        rtl::OUString newName = aTmpName8 + OUString::createFromAscii("/tmpname");
+        rtl::OUString newName = aTmpName8 + OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname"));
         //printFileName( newName );
         nError1 = ::osl::File::move( aTmpName3, newName );
-        //deleteTestDirectory( newName + OUString::createFromAscii("/tmpname") );
+        //deleteTestDirectory( newName + OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpname")) );
         //deleteTestDirectory( newName );
         deleteTestDirectory( aTmpName8 );
         deleteTestDirectory( aTmpName6 );
@@ -5695,8 +5695,8 @@ namespace osl_Directory
 #ifdef UNX
             sal_Bool bOK = sal_False;
             ::rtl::OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
-            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/link.file");
-            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString::createFromAscii("/tmpdir/tmpname");
+            ( ( aUStr_LnkFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/link.file"));
+            ( ( aUStr_SrcFileSys += aSlashURL ) += getCurrentPID( ) ) += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmpdir/tmpname"));
                 rtl::OString strLinkFileName, strSrcFileName;
                 strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
                 strSrcFileName  = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
@@ -5708,7 +5708,7 @@ namespace osl_Directory
 
             //open a directory
             nError1 = testDirectory.open( );
-            ::rtl::OUString aFileName = ::rtl::OUString::createFromAscii("link.file");
+            ::rtl::OUString aFileName (RTL_CONSTASCII_USTRINGPARAM("link.file"));
 
             while (1) {
                 nError1 = testDirectory.getNextItem( rItem, 4 );
@@ -6046,7 +6046,7 @@ namespace osl_Directory
             nError1 = ::osl::Directory::remove( aTmpName3 );
             deleteTestFile( aTmpName4 );
             deleteTestDirectory( aTmpName3 );
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii("test for remove function: try to remove a directory that is not empty.") + errorToStr( nError1 );
+            ::rtl::OUString suError = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test for remove function: try to remove a directory that is not empty.")) + errorToStr( nError1 );
 #if defined ( SOLARIS )
             //on UNX, the implementation uses rmdir(), which EEXIST is thrown on Solaris when the directory is not empty, refer to: 'man -s 2 rmdir', while on linux, ENOTEMPTY is thrown.
             //EEXIST The directory contains entries other than those for "." and "..".
@@ -6243,7 +6243,7 @@ namespace osl_Directory
         void with_UNC_path()
         {
 
-            OUString tp_unc = OUString::createFromAscii("\\\\Tra-1\\TRA_D\\hello\\world\\");
+            OUString tp_unc (RTL_CONSTASCII_USTRINGPARAM("\\\\Tra-1\\TRA_D\\hello\\world\\"));
             OUString tp_url;
             FileBase::getFileURLFromSystemPath(tp_unc, tp_url);
 
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index 291a8022036c..1796248d5f6a 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -82,7 +82,7 @@ public:
         FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(WRITE_DEST_PATH), dest_url);
 
         File tmp_file(dest_url);
-        rtl::OUString suErrorMsg = rtl::OUString::createFromAscii("File creation failed: ")+ dest_url;
+        rtl::OUString suErrorMsg = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("File creation failed: "))+ dest_url;
         FileBase::RC err = tmp_file.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
 
         CPPUNIT_ASSERT_MESSAGE( suErrorMsg, err == FileBase::E_None || err == FileBase::E_EXIST );
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 7ee367d95ae9..0da5701dd2c2 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -66,9 +66,9 @@ inline void printUString( const ::rtl::OUString & str )
 inline ::rtl::OUString getDllURL( void )
 {
 #if ( defined WNT )        // lib in Unix and lib in Windows are not same in file name.
-    ::rtl::OUString libPath( rtl::OUString::createFromAscii( "Module_DLL.dll" ) );
+    ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("Module_DLL.dll") );
 #else
-    ::rtl::OUString libPath( rtl::OUString::createFromAscii( "libModule_DLL.so" ) );
+    ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("libModule_DLL.so") );
 #endif
 
     ::rtl::OUString dirPath, dllPath;
@@ -92,7 +92,7 @@ inline void printFileName( const ::rtl::OUString & str )
 
 inline sal_Bool isURL( const ::rtl::OUString pathname )
 {
-    ::rtl::OUString aPreURL( rtl::OUString::createFromAscii( "file:///" ) );
+    ::rtl::OUString aPreURL( RTL_CONSTASCII_USTRINGPARAM("file:///") );
     return ( ( pathname.indexOf( aPreURL ) == 0 ) ? sal_True : sal_False );
 }
 
@@ -252,7 +252,7 @@ namespace osl_Module
         void getUrlFromAddress_002( )
         {
             ::osl::Module aMod( getDllURL( ) );
-            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
+            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
 
             OUString aFileURL;
             bRes = osl::Module::getUrlFromAddress( ( void* )pFunc, aFileURL );
@@ -302,12 +302,12 @@ namespace osl_Module
         {
 #ifdef UNX
             //Can not get a CJK directory already exist, so here create one. Perhaps reason is encoding problem.
-            ::rtl::OUString aPidDirURL = rtl::OUString::createFromAscii( "file:///tmp/" ) + ::rtl::OUString::valueOf( ( long )getpid( ) );
+            ::rtl::OUString aPidDirURL = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///tmp/")) + ::rtl::OUString::valueOf( ( long )getpid( ) );
             ::rtl::OUString aMyDirURL = aPidDirURL + aKname;
             createTestDirectory( aPidDirURL );
             createTestDirectory( aMyDirURL );
 
-            ::rtl::OUString aDLLURL = aMyDirURL + rtl::OUString::createFromAscii( "/libModule_DLL.so" );
+            ::rtl::OUString aDLLURL = aMyDirURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/libModule_DLL.so"));
             //check if the lib exist.
             //FIXME: if assert condition is false, the case will return, so the directory will not be clean-up
             CPPUNIT_ASSERT_MESSAGE( "#Source file is not exist. please manually clean-up directory and file under /tmp", ifFileExist( getDllURL( ) ) == sal_True );
@@ -317,7 +317,7 @@ namespace osl_Module
             CPPUNIT_ASSERT_MESSAGE( "#This file is not exist, copy failed. please manually clean-up directory and file under /tmp", ifFileExist( aDLLURL ) == sal_True );
 
             //test if can create a normal file
-            ::rtl::OUString aFileURL = aMyDirURL + rtl::OUString::createFromAscii( "/test_file" );
+            ::rtl::OUString aFileURL = aMyDirURL + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/test_file"));
             ::osl::File testFile( aFileURL );
             nError = testFile.open( OpenFlag_Create );
             CPPUNIT_ASSERT_MESSAGE( "#create failed. please manually clean-up directory and file under /tmp", nError == ::osl::FileBase::E_None );
@@ -416,7 +416,7 @@ namespace osl_Module
         void getSymbol_001( )
         {
             ::osl::Module aMod( getDllURL( ) );
-            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
+            FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
             bRes = sal_False;
             if ( pFunc )
                 bRes = pFunc( bRes );
@@ -457,7 +457,7 @@ namespace osl_Module
         void optr_oslModule_002( )
         {
             ::osl::Module aMod( getDllURL( ) );
-            ::rtl::OUString funcName(::rtl::OUString::createFromAscii( "firstfunc" ) );
+            ::rtl::OUString funcName( RTL_CONSTASCII_USTRINGPARAM("firstfunc") );
 
             FuncPtr pFunc = ( FuncPtr ) osl_getSymbol( (oslModule)aMod, funcName.pData );
             bRes = sal_False;
@@ -487,7 +487,7 @@ namespace osl_Module
         void getFunctionSymbol_001( )
         {
             ::osl::Module aMod( getDllURL( ) );
-            oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString::createFromAscii( "firstfunc" ) );
+            oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
             ::rtl::OUString aLibraryURL;
             bRes = ::osl::Module::getUrlFromAddress( oslFunc, aLibraryURL);
             aMod.unload();
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 27c0c8dcff97..0304b00da133 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -129,9 +129,9 @@ inline void printPipeError( ::osl::Pipe aPipe )
 //------------------------------------------------------------------------
 // pipe name and transfer contents
 //------------------------------------------------------------------------
-const rtl::OUString aTestPipeName = rtl::OUString::createFromAscii( "testpipe2" );
-const rtl::OUString aTestPipe1 = rtl::OUString::createFromAscii( "testpipe1" );
-const rtl::OUString aTestString = rtl::OUString::createFromAscii( "Sun Microsystems" );
+const rtl::OUString aTestPipeName(RTL_CONSTASCII_USTRINGPARAM("testpipe2"));
+const rtl::OUString aTestPipe1(RTL_CONSTASCII_USTRINGPARAM("testpipe1"));
+const rtl::OUString aTestString(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems"));
 
 const OString m_pTestString1("Sun Microsystems");
 const OString m_pTestString2("test pipe PASS/OK");
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index eaee6bdc72af..d3cea39002bc 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -60,9 +60,9 @@
 #include <string>
 
 #if defined(WNT) || defined(OS2)
-    const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("osl_process_child.exe");
+    const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child.exe"));
 #else
-    const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("osl_process_child");
+    const rtl::OUString EXECUTABLE_NAME (RTL_CONSTASCII_USTRINGPARAM("osl_process_child"));
 #endif
 
 
@@ -96,7 +96,7 @@ inline ::rtl::OUString getExecutablePath( void )
     osl::Module::getUrlFromAddress( ( void* ) &getExecutablePath, dirPath );
     dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') );
     dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1);
-    dirPath += rtl::OUString::createFromAscii("bin");
+    dirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin"));
     return dirPath;
 }
 
@@ -116,15 +116,15 @@ class Test_osl_joinProcess : public CppUnit::TestFixture
 public:
 
     Test_osl_joinProcess() :
-        join_param_(OUString::createFromAscii("-join")),
-        wait_time_(OUString::createFromAscii("1")),
+        join_param_(OUString(RTL_CONSTASCII_USTRINGPARAM("-join"))),
+        wait_time_(OUString(RTL_CONSTASCII_USTRINGPARAM("1"))),
         parameters_count_(2)
     {
         parameters_[0] = join_param_.pData;
         parameters_[1] = wait_time_.pData;
         suCWD = getExecutablePath();
         suExecutableFileURL = suCWD;
-        suExecutableFileURL += rtl::OUString::createFromAscii("/");
+        suExecutableFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         suExecutableFileURL += EXECUTABLE_NAME;
     }
 
@@ -386,13 +386,13 @@ public:
     //------------------------------------------------
     // ctor
     Test_osl_executeProcess() :
-        env_param_(OUString::createFromAscii("-env")),
+        env_param_(OUString(RTL_CONSTASCII_USTRINGPARAM("-env"))),
         parameters_count_(2)
     {
         parameters_[0] = env_param_.pData;
         suCWD = getExecutablePath();
         suExecutableFileURL = suCWD;
-        suExecutableFileURL += rtl::OUString::createFromAscii("/");
+        suExecutableFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         suExecutableFileURL += EXECUTABLE_NAME;
     }
 
@@ -604,7 +604,7 @@ public:
     void osl_execProc_test_batch()
     {
         oslProcess process;
-        rtl::OUString suBatch = suCWD + rtl::OUString::createFromAscii("/") + rtl::OUString::createFromAscii("batch.bat");
+        rtl::OUString suBatch = suCWD + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("batch.bat"));
         oslProcessError osl_error = osl_executeProcess(
             suBatch.pData,
             NULL,
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index dd2b3789bf1c..e6ce837bbbbe 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -193,8 +193,8 @@ namespace osl_AcceptorSocket
 
         void listen_accept_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -215,9 +215,9 @@ namespace osl_AcceptorSocket
 
         void listen_accept_002()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index e1dbf2be8764..6bfc718c9967 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -158,9 +158,9 @@ namespace osl_ConnectorSocket
 
         void connect_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT2 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT2 );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -187,9 +187,9 @@ namespace osl_ConnectorSocket
         //non-blocking mode connect?
         void connect_002()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             asAcceptorSocket.enableNonBlockingMode( sal_True );
@@ -213,8 +213,8 @@ namespace osl_ConnectorSocket
         // how to design senarios that will return osl_Socket_Interrupted, osl_Socket_TimedOut
         void connect_003()
         {
-            ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 );
-            ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 );
 
             csConnectorSocket.enableNonBlockingMode( sal_False );
 
@@ -231,7 +231,7 @@ namespace osl_ConnectorSocket
         // really an error in non-blocking mode
         void connect_004()
         {
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT3 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 );
 
             csConnectorSocket.enableNonBlockingMode( sal_True );
 
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 5a1acff9ef7b..9ff799e95e98 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -149,7 +149,7 @@ protected:
 
 public:
     TalkerThread( ):
-        saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 )
+        saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 )
     {
     }
 
@@ -170,7 +170,7 @@ protected:
 
     void SAL_CALL run( )
     {
-        ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 );
+        ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
         dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
         if ( dsSocket.bind( saLocalSocketAddr ) == sal_False )
         {
@@ -189,7 +189,7 @@ protected:
 public:
     sal_Char pRecvBuffer[30];
     ListenerThread( ):
-        saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 )
+        saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 )
     {
         pRecvBuffer[0] = '\0';
     }
@@ -215,7 +215,7 @@ public:
 
         void sr_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
             ::osl::DatagramSocket dsSocket;
             dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
             dsSocket.bind( saLocalSocketAddr );
@@ -235,7 +235,7 @@ public:
 
         void sr_002()
         {
-            ::osl::SocketAddr saListenSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
             ::osl::DatagramSocket dsSocket;
 
             //listener thread construct a DatagramSocket, recvFrom waiting for data, then main thread sendto data
@@ -260,7 +260,7 @@ public:
         //sendTo error, return -1; recvFrom error, return -1
         void sr_003()
         {
-            ::osl::SocketAddr saListenSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 );
             ::osl::DatagramSocket dsSocket;
             // Transport endpoint is not connected
             sal_Int32 nSend = dsSocket.sendTo( saListenSocketAddr, pTestString2, strlen( pTestString2 ) + 1 );
@@ -270,8 +270,8 @@ public:
 
         void sr_004()
         {
-            ::osl::SocketAddr saListenSocketAddr1( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT10 );
-            ::osl::SocketAddr saListenSocketAddr2( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saListenSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saListenSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_MYPORT10 );
             ::osl::DatagramSocket dsSocket;
 
             dsSocket.enableNonBlockingMode( sal_True );
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 98c32ee7b32a..c3505fad72e8 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -195,11 +195,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r
     if ( returnVal.equals( rightVal ) )
         return aUString;
     aUString += ::rtl::OUString::createFromAscii(msg);
-    aUString += ::rtl::OUString::createFromAscii(": the returned value is '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '"));
     aUString += returnVal;
-    aUString += ::rtl::OUString::createFromAscii("', but the value should be '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '"));
     aUString += rightVal;
-    aUString += ::rtl::OUString::createFromAscii("'.");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
     return aUString;
 }
 
@@ -744,11 +744,11 @@ namespace osl_SocketAddr
 
             sal_Bool bOk = compareUString(suHost, suHost2);
 
-            rtl::OUString suError = rtl::OUString::createFromAscii("Host names should be the same. From SocketAddr.getLocalHostname() it is'");
+            rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'"));
             suError += suHost;
-            suError += rtl::OUString::createFromAscii("', from getThisHostname() it is '");
+            suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '"));
             suError += suHost2;
-            suError += rtl::OUString::createFromAscii("'.");
+            suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
 
             CPPUNIT_ASSERT_MESSAGE(suError, sal_True == bOk);
         }
@@ -936,7 +936,7 @@ namespace osl_SocketAddr
 // LLA: this function does not work in company (Linux, Windows) but at home
         void getHostname_002()
         {
-            rtl::OUString suHostname = rtl::OUString::createFromAscii("cn-1.germany.sun.com");
+            rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com"));
             rtl::OUString aHostIP    = getIPbyName( oustring2char( suHostname ) );
 
             ::osl::SocketAddr saSocketAddr( aHostName1, IP_PORT_FTP );
@@ -1345,7 +1345,7 @@ namespace osl_SocketAddr
             // LLA: IMHO localhost, or hostname by itself should be ok.
             rtl::OUString suThisHost = getThisHostname( );
             bool bOk = false;
-            if (suThisHost.equals(rtl::OUString::createFromAscii("localhost")))
+            if (suThisHost.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost"))))
             {
                 bOk = true;
             }
@@ -1402,7 +1402,7 @@ namespace osl_SocketAddr
     /** testing the method:
         static inline sal_Int32 SAL_CALL getServicePort(
             const ::rtl::OUString& strServiceName,
-            const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) );
+            const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
     */
 
     class gettheServicePort : public CppUnit::TestFixture
@@ -1430,7 +1430,7 @@ namespace osl_SocketAddr
         void gettheServicePort_004()
         {
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.",
-                                      OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString::createFromAscii( "notexist" ), aProtocolUDP ) );
+                                      OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), aProtocolUDP ) );
         }
 
         CPPUNIT_TEST_SUITE( gettheServicePort );
@@ -1772,7 +1772,7 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
             CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
 
             sSocket.getLocalAddr( saLocalSocketAddr );
@@ -1820,7 +1820,7 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
             CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
             sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( )  );
 
@@ -1851,7 +1851,7 @@ namespace osl_Socket
             (void)bOK;
 #else
             //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case");
+            ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"));
 #endif
             CPPUNIT_ASSERT_MESSAGE( suError, sal_False );
 
@@ -1865,10 +1865,10 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
             CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
             ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )),
-                ::rtl::OUString::createFromAscii("34463"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")),
                 "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned");
             sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 &&  sSocket.getLocalPort( ) <= 65535);
 
@@ -1917,7 +1917,7 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
             CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
             sal_Bool bOK;
             ::rtl::OUString suError;
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 2f15d8539f2f..a6a681a8a731 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -376,7 +376,7 @@ namespace osl_Socket
         {
 //#if defined(LINUX)
             ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("127.0.0.1") );
+            AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) );
             myAcceptorThread.create();
 
             thread_sleep( 1 );
@@ -395,7 +395,7 @@ namespace osl_Socket
         void close_003()
         {
             ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("0.0.0.0") );
+            AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0.0.0")) );
             myAcceptorThread.create();
 
             thread_sleep( 1 );
@@ -437,13 +437,13 @@ namespace osl_Socket
         void getLocalAddr_001()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT8 );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT8 );
             ::osl::SocketAddr saLocalSocketAddr;
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
             CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
 
             sSocket.getLocalAddr( saLocalSocketAddr );
@@ -485,13 +485,13 @@ namespace osl_Socket
         void getLocalPort_001()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT7 );  // aHostIp1 localhost
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT7 );  // aHostIp1 localhost
             ::osl::SocketAddr saLocalSocketAddr;
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
             CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
             sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( )  );
 
@@ -509,7 +509,7 @@ namespace osl_Socket
     */
         void getLocalPort_002()
         {
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_TELNET);
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_TELNET);
 #ifdef WNT
             ::osl::Socket sSocket(sHandle);
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True);
@@ -522,7 +522,7 @@ namespace osl_Socket
             (void)bOK;
 #else
             //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT
-            ::rtl::OUString suError = ::rtl::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case");
+            ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"));
 #endif
             CPPUNIT_ASSERT_MESSAGE( suError, sal_False );
 
@@ -536,10 +536,10 @@ namespace osl_Socket
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
             CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
             ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )),
-                ::rtl::OUString::createFromAscii("34463"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")),
                 "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned");
             sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 &&  sSocket.getLocalPort( ) <= 65535);
 
@@ -583,12 +583,12 @@ namespace osl_Socket
         {
             ::osl::Socket sSocket(sHandle);
             //port number from IP_PORT_HTTP1 to IP_PORT_MYPORT6, mindyliu
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT6 );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT6 );
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
 
             sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
-            ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString();
+            ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
             CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 );
             sal_Bool bOK;
             ::rtl::OUString suError;
@@ -610,14 +610,14 @@ namespace osl_Socket
         void getLocalHost_002()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_POP3);
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_POP3);
             ::osl::SocketAddr saLocalSocketAddr;
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             sSocket.bind( saBindSocketAddr );
             //Invalid IP, so bind should fail
-            sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString::createFromAscii("") ) ;
-            ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString::createFromAscii(""), "test for getLocalHost function: getLocalHost with invalid SocketAddr");
+            sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ) ;
+            ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString(), "test for getLocalHost function: getLocalHost with invalid SocketAddr");
 
             CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK );
         }
@@ -664,9 +664,9 @@ namespace osl_Socket
 
         void getPeer_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
             asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             /// launch server socket
@@ -740,7 +740,7 @@ namespace osl_Socket
         void bind_002()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_NETBIOS );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_NETBIOS );
             ::osl::SocketAddr saLocalSocketAddr;
 
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1); // sal_True);
@@ -792,9 +792,9 @@ namespace osl_Socket
 
         void isRecvReady_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT1 );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT1 );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
             /// launch server socket
             asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True);
@@ -855,9 +855,9 @@ namespace osl_Socket
 
         void isSendReady_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
-            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
-            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+            ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+            ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -1222,7 +1222,7 @@ namespace osl_Socket
 
         void enableNonBlockingMode_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -1260,7 +1260,7 @@ namespace osl_Socket
 
         void isNonBlockingMode_001()
         {
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
             ::osl::StreamSocket ssConnection;
 
             /// launch server socket
@@ -1311,7 +1311,7 @@ namespace osl_Socket
         void clearError_001()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_HTTP2 );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_HTTP2 );
             ::osl::SocketAddr saLocalSocketAddr;
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail"
@@ -1353,7 +1353,7 @@ namespace osl_Socket
         void getError_001()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             ::osl::SocketAddr saLocalSocketAddr;
 
             CPPUNIT_ASSERT_MESSAGE( "test for getError function: should get no error.",
@@ -1363,7 +1363,7 @@ namespace osl_Socket
         void getError_002()
         {
             ::osl::Socket sSocket(sHandle);
-            ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_FTP );
+            ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_FTP );
             ::osl::SocketAddr saLocalSocketAddr;
             sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
             sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail"
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index 953d43548e6c..086123805e4f 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -116,11 +116,11 @@ namespace osl_SocketAddr
 
             sal_Bool bOk = compareUString(suHost, suHost2);
 
-            rtl::OUString suError = rtl::OUString::createFromAscii("Host names should be the same. From SocketAddr.getLocalHostname() it is'");
+            rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'"));
             suError += suHost;
-            suError += rtl::OUString::createFromAscii("', from getThisHostname() it is '");
+            suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '"));
             suError += suHost2;
-            suError += rtl::OUString::createFromAscii("'.");
+            suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
 
             CPPUNIT_ASSERT_MESSAGE(suError, sal_True == bOk);
         }
@@ -128,7 +128,7 @@ namespace osl_SocketAddr
         void ctors_copy()
         {
             /// SocketAddr copy constructor.
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
             ::osl::SocketAddr saCopySocketAddr( saSocketAddr );
 
             sal_Int32 nPort = saCopySocketAddr.getPort( );
@@ -139,7 +139,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_no_001()
         {
-            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
             CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
 
             oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
@@ -156,7 +156,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_no_002()
         {
-            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
                    CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
                    oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
                    ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY );
@@ -169,7 +169,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_handle_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
             ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) );
 
             CPPUNIT_ASSERT_MESSAGE("test for SocketAddr copy handle constructor function: copy another Socket's handle, get its port to check copy effect.",
@@ -178,7 +178,7 @@ namespace osl_SocketAddr
 
         void ctors_copy_handle_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
             ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) );
             saSocketAddrCopy.setPort( IP_PORT_HTTP2 );
 
@@ -189,7 +189,7 @@ namespace osl_SocketAddr
         void ctors_hostname_port_001()
         {
             /// tcpip-specif constructor.
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             printUString( saSocketAddr.getHostname( ), "ctors_hostname_port_001:getHostname");
 
             CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: do a constructor using tcpip spec, check the result.",
@@ -202,7 +202,7 @@ namespace osl_SocketAddr
         void ctors_hostname_port_002()
         {
             /// tcpip-specif constructor.
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT2 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT2 );
 
             CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: using an invalid IP address, the socketaddr ctors should fail", sal_False == saSocketAddr.is( ));
         }
@@ -238,7 +238,7 @@ namespace osl_SocketAddr
         // refer to setPort_003()
         void is_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_INVAL );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_INVAL );
 
             CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid port number",
                                     sal_True == saSocketAddr.is( ) );
@@ -246,7 +246,7 @@ namespace osl_SocketAddr
 
         void is_003()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT );
 
             CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid Ip number",
                                     sal_True != saSocketAddr.is( ) );
@@ -278,7 +278,7 @@ namespace osl_SocketAddr
 
         void getHostname_000()
             {
-                ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.107"), IP_PORT_FTP );
+                ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP );
                 rtl::OUString suResult = saSocketAddr.getHostname( 0 );
 
             }
@@ -290,16 +290,16 @@ namespace osl_SocketAddr
         */
         void getHostname_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.107"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP );
             rtl::OUString suResult = saSocketAddr.getHostname( 0 );
-            rtl::OUString suError = outputError(suResult, rtl::OUString::createFromAscii("sceri.PRC.Sun.COM"), "test for getHostname(0)");
-            sal_Bool bOK = compareUString( suResult, rtl::OUString::createFromAscii("sceri.PRC.Sun.COM") );
+            rtl::OUString suError = outputError(suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")), "test for getHostname(0)");
+            sal_Bool bOK = compareUString( suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")) );
             // search the returned hostname in /etc/hosts, if find, and the IP in the row is same as IP
             // in the Addr, it's right also.
             if ( bOK == sal_False)
             {
                 rtl::OString aString = ::rtl::OUStringToOString( suResult, RTL_TEXTENCODING_ASCII_US );
-                if ( compareUString( getIPbyName( aString ), rtl::OUString::createFromAscii("129.158.217.107") ) == sal_True )
+                if ( compareUString( getIPbyName( aString ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")) ) == sal_True )
                     bOK = sal_True;
             }
             CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK);
@@ -309,11 +309,11 @@ namespace osl_SocketAddr
 // LLA: this function does not work in company (Linux, Windows) but at home
         void getHostname_002()
         {
-            rtl::OUString suHostname = rtl::OUString::createFromAscii("cn-1.germany.sun.com");
+            rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com"));
             rtl::OString aString = ::rtl::OUStringToOString( suHostname, RTL_TEXTENCODING_ASCII_US );
             rtl::OUString aHostIP    = getIPbyName( aString );
 
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_FTP );
             sal_Bool bOK = saSocketAddr.setHostname( suHostname );
             CPPUNIT_ASSERT_MESSAGE("#SocketAddr.setHostname failed", sal_True == bOK );
             oslSocketResult aResult;
@@ -353,7 +353,7 @@ namespace osl_SocketAddr
     public:
         void getPort_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getPort() function: get a normal port number.",
                                     IP_PORT_FTP == saSocketAddr.getPort( ) );
@@ -361,7 +361,7 @@ namespace osl_SocketAddr
 
         void getPort_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_INVAL );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_INVAL );
 
             //t_print("#getPort_002: Port number is %d \n", saSocketAddr.getPort( ));
 
@@ -372,7 +372,7 @@ namespace osl_SocketAddr
         //2. SocketAddr family is not osl_Socket_FamilyInet, but case 2 could not be constructed
         void getPort_003()
         {
-            rtl::OUString suInvalidIP = rtl::OUString::createFromAscii("123.345.67.89");
+            rtl::OUString suInvalidIP (RTL_CONSTASCII_USTRINGPARAM("123.345.67.89"));
             ::osl::SocketAddr saSocketAddr( suInvalidIP, IP_PORT_MYPORT );
 
             CPPUNIT_ASSERT_MESSAGE( "test for getPort( ) function: give an invalid IP to a SocketAddr, get the port to see returned value. ",
@@ -399,7 +399,7 @@ namespace osl_SocketAddr
     public:
         void setPort_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             sal_Bool bOK = saSocketAddr.setPort( IP_PORT_TELNET );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setPort() function: modify a port number setting, and check it.",
@@ -417,7 +417,7 @@ namespace osl_SocketAddr
         */
         void setPort_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             sal_Bool bOK = saSocketAddr.setPort( IP_PORT_ZERO );
 
             oslSocket sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
@@ -436,7 +436,7 @@ namespace osl_SocketAddr
 
         void setPort_003()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP);
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP);
             sal_Bool bOK = saSocketAddr.setPort( IP_PORT_INVAL );
             //on Linux, getPort return 34463
             //t_print("#Port number is %d \n", saSocketAddr.getPort( ));
@@ -449,7 +449,7 @@ namespace osl_SocketAddr
         /* this is not a inet-addr => can't set port */
         void setPort_004()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_FTP);
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_FTP);
             sal_Bool bOK = saSocketAddr.setPort( IP_PORT_MYPORT );
 
             CPPUNIT_ASSERT_MESSAGE( "test for setPort( ) function: set an invalid address with valid port. it should return error.",
@@ -486,8 +486,8 @@ namespace osl_SocketAddr
     public:
         void setAddr_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
-            saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString::createFromAscii("127.0.0.1") ) );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+            saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ) );
             ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 );
             sal_Bool bOK = sal_False;
 
@@ -517,7 +517,7 @@ namespace osl_SocketAddr
         void getAddr_001()
         {
             oslSocketResult SocketResult;
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
             ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( &SocketResult );
 
             sal_Bool bOK = sal_False;
@@ -550,8 +550,8 @@ namespace osl_SocketAddr
     public:
         void operator_equal_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             saSocketAddrEqual = saSocketAddr;
             sal_Bool bOK = sal_False;
@@ -568,8 +568,8 @@ namespace osl_SocketAddr
 
         void operator_equal_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.199"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.199")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             saSocketAddrEqual = saSocketAddr;
             CPPUNIT_ASSERT_MESSAGE( "after assign, the assigned SocketAddr is not same as the original Addr",
@@ -583,8 +583,8 @@ namespace osl_SocketAddr
 
         void operator_equal_const_001()
         {
-            const ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             saSocketAddrEqual = saSocketAddr;
             sal_Bool bOK = sal_False;
@@ -600,8 +600,8 @@ namespace osl_SocketAddr
 
         void operator_equal_const_002()
         {
-            const ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+            const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
 
             saSocketAddrEqual = saSocketAddr;
             saSocketAddrEqual.setPort( IP_PORT_HTTP1 );
@@ -612,9 +612,9 @@ namespace osl_SocketAddr
 
         void operator_equal_assign_001()
         {
-            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET );
+            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
                    CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
-                   ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP );
+                   ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
                    oslSocketAddr poslSocketAddr = pSocketAddr->getHandle( );
                    //if( m_handle ) osl_destroySocketAddr( m_handle ); so pSocketAddrAssign had been destroyed and then point to pSocketAddr
                    pSocketAddrAssign->assign(poslSocketAddr, SAL_NO_COPY);
@@ -627,8 +627,8 @@ namespace osl_SocketAddr
 
         void operator_is_equal_001()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET);
-            ::osl::SocketAddr saSocketAddrequal( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
+            ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
 
             CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two identical Address.",
                                       sal_True == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) );
@@ -636,8 +636,8 @@ namespace osl_SocketAddr
 
         void operator_is_equal_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP);
-            ::osl::SocketAddr saSocketAddrequal( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP);
+            ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
 
             CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two different Address.",
                                       sal_False == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) );
@@ -667,7 +667,7 @@ namespace osl_SocketAddr
 
         void getSocketAddrHandle_001()
         {
-            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+            ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
                    CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
                    oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
                    ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY );
@@ -680,7 +680,7 @@ namespace osl_SocketAddr
 
         void getSocketAddrHandle_002()
         {
-            ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("deuce.PRC.Sun.COM"), IP_PORT_MYPORT4 );
+            ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("deuce.PRC.Sun.COM")), IP_PORT_MYPORT4 );
             oslSocketAddr poslSocketAddr = saSocketAddr.getHandle( );
 
             sal_Bool bOK = ( saSocketAddr == poslSocketAddr );
@@ -725,7 +725,7 @@ namespace osl_SocketAddr
             // LLA: IMHO localhost, or hostname by itself should be ok.
             rtl::OUString suThisHost = getThisHostname( );
             bool bOk = false;
-            if (suThisHost.equals(rtl::OUString::createFromAscii("localhost")))
+            if (suThisHost.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost"))))
             {
                 bOk = true;
             }
@@ -761,7 +761,7 @@ namespace osl_SocketAddr
         void resolveHostname_001()
         {
             ::osl::SocketAddr saSocketAddr;
-            ::osl::SocketAddr::resolveHostname( rtl::OUString::createFromAscii("127.0.0.1"), saSocketAddr );
+            ::osl::SocketAddr::resolveHostname( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), saSocketAddr );
             ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 );
             sal_Bool bOK = sal_False;
 
@@ -782,7 +782,7 @@ namespace osl_SocketAddr
     /** testing the method:
         static inline sal_Int32 SAL_CALL getServicePort(
             const ::rtl::OUString& strServiceName,
-            const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) );
+            const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
     */
 
     class gettheServicePort : public CppUnit::TestFixture
@@ -790,8 +790,8 @@ namespace osl_SocketAddr
     public:
         void gettheServicePort_001()
         {
-            rtl::OUString suServiceFTP  = rtl::OUString::createFromAscii( "ftp" );
-            rtl::OUString suProtocolTCP = rtl::OUString::createFromAscii( "tcp" );
+            rtl::OUString suServiceFTP  (RTL_CONSTASCII_USTRINGPARAM("ftp"));
+            rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp"));
 
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get ftp service port on TCP protocol.",
                                       IP_PORT_FTP== ::osl::SocketAddr::getServicePort( suServiceFTP, suProtocolTCP ) );
@@ -799,8 +799,8 @@ namespace osl_SocketAddr
 
         void gettheServicePort_002()
         {
-            rtl::OUString suServiceTELNET  = rtl::OUString::createFromAscii( "telnet" );
-            rtl::OUString suProtocolTCP    = rtl::OUString::createFromAscii( "tcp" );
+            rtl::OUString suServiceTELNET  (RTL_CONSTASCII_USTRINGPARAM("telnet"));
+            rtl::OUString suProtocolTCP    (RTL_CONSTASCII_USTRINGPARAM("tcp"));
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get telnet service port on TCP protocol.",
                                       IP_PORT_TELNET== ::osl::SocketAddr::getServicePort( suServiceTELNET, suProtocolTCP ) );
         }
@@ -808,17 +808,17 @@ namespace osl_SocketAddr
         void gettheServicePort_003()
         {
         //Solaris has no service called "https", please see /etc/services
-            rtl::OUString suServiceNETBIOS = rtl::OUString::createFromAscii( "netbios-dgm" );
-            rtl::OUString suProtocolUDP    = rtl::OUString::createFromAscii( "udp" );
+            rtl::OUString suServiceNETBIOS (RTL_CONSTASCII_USTRINGPARAM("netbios-dgm"));
+            rtl::OUString suProtocolUDP    (RTL_CONSTASCII_USTRINGPARAM("udp"));
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get netbios-ssn service port on UDP protocol.",
                                       IP_PORT_NETBIOS_DGM == ::osl::SocketAddr::getServicePort( suServiceNETBIOS, suProtocolUDP ) );
         }
 
         void gettheServicePort_004()
         {
-            rtl::OUString suProtocolUDP    = rtl::OUString::createFromAscii( "udp" );
+            rtl::OUString suProtocolUDP(RTL_CONSTASCII_USTRINGPARAM( "udp" ));
             CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.",
-                                      OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString::createFromAscii( "notexist" ), suProtocolUDP ) );
+                                      OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), suProtocolUDP ) );
         }
 
         CPPUNIT_TEST_SUITE( gettheServicePort );
@@ -839,7 +839,7 @@ namespace osl_SocketAddr
     public:
         void getFamilyOfSocketAddr_001()
         {
-                   ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 );
+                   ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
                    oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( );
                    CPPUNIT_ASSERT_EQUAL(
                     osl_Socket_FamilyInet,
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 939c01b24a04..2164dbcd72b3 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -138,7 +138,7 @@ protected:
     void SAL_CALL run( )
         {
             ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
             ::osl::StreamSocket ssStreamConnection;
 
             //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket
@@ -248,7 +248,7 @@ protected:
 public:
     ClientSocketThread( osl::Condition &_aCond  ):
             m_aCondition(_aCond),
-            m_saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ),
+            m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ),
             m_csConnectorSocket( )
         {
             m_id = getIdentifier( );
@@ -331,7 +331,7 @@ protected:
 
     void SAL_CALL run( )
         {
-            ::osl::SocketAddr      m_aTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr      m_aTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
             ::osl::ConnectorSocket m_aConnectorSocket;
 
             if (! m_aTargetSocketAddr.is())
@@ -412,7 +412,7 @@ protected:
         {
             t_print("start WriteSocketThread\n");
             ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 );
+            ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
             if (! saLocalSocketAddr.is())
             {
                 t_print("LocalSocketAddr was NOT created successfully!\n");
@@ -636,7 +636,7 @@ namespace osl_StreamSocket
         void send_recv2()
             {
                 ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 );
+                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
                 ::osl::StreamSocket ssStreamConnection;
                 sal_Char pReadBuffer[30] = "";
 
@@ -756,7 +756,7 @@ namespace osl_StreamSocket
             }
     public:
         SendClientThread(  ):
-                m_saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ),
+                m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ),
                 m_csConnectorSocket( )
             {
                 //t_print("# successfully creat this SendClientThread %d!\n",  m_id );
@@ -788,7 +788,7 @@ namespace osl_StreamSocket
             {
 #if defined(LINUX)
                 ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-                AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("127.0.0.1") );
+                AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) );
                 myAcceptorThread.create();
 
                 thread_sleep( 1 );
@@ -805,7 +805,7 @@ namespace osl_StreamSocket
         void shutdown_002()
             {
                 ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9);
+                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9);
                 asSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
                 CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True);
                 CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True );
@@ -858,7 +858,7 @@ namespace osl_StreamSocket
         void shutdown_003()
             {
                 ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9);
+                ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9);
                 asSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
                 CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True);
                 CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True );
@@ -937,7 +937,7 @@ namespace osl_StreamSocket
 // LLA:     void SAL_CALL run( )
 // LLA:     {
 // LLA:         ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-// LLA:         ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("10.16.66.252"), 8888 );
+// LLA:         ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.66.252")), 8888 );
 // LLA:         ::osl::StreamSocket ssStreamConnection;
 // LLA:
 // LLA:         //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket
@@ -1216,9 +1216,9 @@ namespace osl_StreamSocket
     public:
 // LLA: orig        void send_recv()
 // LLA: orig             {
-// LLA: orig                if ( ifAvailable(rtl::OUString::createFromAscii("margritte.germany")) == sal_True )
+// LLA: orig                if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True )
 // LLA: orig                    t_print("margritte is alive ! \n");
-// LLA: orig                if ( ifAvailable(rtl::OUString::createFromAscii("10.16.66.252")) == sal_False )
+// LLA: orig                if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.66.252"))) == sal_False )
 // LLA: orig                {
 // LLA: orig            t_print("ip 10.16.66.252 is not alive! \n");
 // LLA: orig            return;
@@ -1297,7 +1297,7 @@ namespace osl_StreamSocket
         void send_recv()
             {
                 rtl::OString sAddr;
-                // if ( ifAvailable(rtl::OUString::createFromAscii("margritte.germany")) == sal_True )
+                // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True )
                 // {
                 //     t_print("margritte is alive ! \n");
                 //     sAddr = "margritte.germany";
@@ -1310,21 +1310,21 @@ namespace osl_StreamSocket
                 }
 //                 else
 //                 {
-//                     if ( ifAvailable(rtl::OUString::createFromAscii("192.168.7.2")) == sal_True )
+//                     if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("192.168.7.2"))) == sal_True )
 //                     {
 //                         sAddr = "192.168.7.2";
 //                         t_print("moon found ! \n");
 //                     }
 //                     else
 //                     {
-//                         if ( ifAvailable(rtl::OUString::createFromAscii("moon.linux.bogus")) == sal_True )
+//                         if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon.linux.bogus"))) == sal_True )
 //                         {
 //                             sAddr = "moon.linux.bogus";
 //                             t_print("moon found ! \n");
 //                         }
 //                         else
 //                         {
-//                             if ( ifAvailable(rtl::OUString::createFromAscii("moon")) == sal_True )
+//                             if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon"))) == sal_True )
 //                             {
 //                                 sAddr = "moon";
 //                                 t_print("moon found ! \n");
@@ -1333,7 +1333,7 @@ namespace osl_StreamSocket
 //                     }
 //                 }
 
-                // if ( ifAvailable(rtl::OUString::createFromAscii("10.16.64.196")) == sal_False )
+                // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.64.196"))) == sal_False )
                 // {
                 //     t_print("ip 10.16.64.196 is not alive! \n");
                 //     return;
diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index 242b8b792fac..8be0a525451f 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -175,11 +175,11 @@ void printUString( const ::rtl::OUString & str, const char* msg)
     if ( returnVal.equals( rightVal ) )
         return aUString;
     aUString += ::rtl::OUString::createFromAscii(msg);
-    aUString += ::rtl::OUString::createFromAscii(": the returned value is '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(":  the returned value is '"));
     aUString += returnVal;
-    aUString += ::rtl::OUString::createFromAscii("', but the value should be '");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '"));
     aUString += rightVal;
-    aUString += ::rtl::OUString::createFromAscii("'.");
+    aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
     return aUString;
 }
 
diff --git a/sal/qa/rtl/bootstrap/bootstrap_process.cxx b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
index 7c6880822ca4..30b7c2308208 100644
--- a/sal/qa/rtl/bootstrap/bootstrap_process.cxx
+++ b/sal/qa/rtl/bootstrap/bootstrap_process.cxx
@@ -45,7 +45,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     //custom .ini/rc file
     Bootstrap aBs_custom( OUString::createFromAscii(argv[3]) );
     OUString suValue;
-    OUString suDefault( OUString::createFromAscii("mydefault") );
+    OUString suDefault( RTL_CONSTASCII_USTRINGPARAM("mydefault") );
     int flag = atoi( argv[1] );
 
     switch( flag ) {
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index daa992a1bd4f..0efb69351889 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -95,7 +95,7 @@ inline ::rtl::OUString getModulePath( void )
 
     suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') );
     suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1);
-    suDirPath += rtl::OUString::createFromAscii("bin");
+    suDirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin"));
     return suDirPath;
 }
 
@@ -122,12 +122,12 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename)
 {
 
      rtl::OUString aDirURL(getExecutableDirectory());
-     aDirURL += OUString::createFromAscii( "/");
+     aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
      aDirURL += OUString::createFromAscii( _sFilename.getStr() );
 #if defined(WNT) || defined(OS2)
-    aDirURL += rtl::OUString::createFromAscii(".ini");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini"));
 #else
-    aDirURL += rtl::OUString::createFromAscii("rc");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc"));
 #endif
     return aDirURL;
 
@@ -137,12 +137,12 @@ inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename)
   rtl::OUString suPath;
   if (filename != "")
   {
-  suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString::createFromAscii( "/sal/qa/rtl/bootstrap/" )
+  suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sal/qa/rtl/bootstrap/"))
   + rtl::OUString::createFromAscii( filename );
   }
   else
   {
-  suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString::createFromAscii( "/sal/qa/rtl/bootstrap" );
+  suPath = rtl::OUString::createFromAscii(pStr) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/sal/qa/rtl/bootstrap"));
   }
   rtl::OUString suURL;
   ::osl::FileBase::getFileURLFromSystemPath( suPath, suURL );
@@ -185,7 +185,7 @@ namespace rtl_Bootstrap
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 printUString( suIniname );
                 Bootstrap aBootstrap( suIniname );
-                rtl::OUString suGetname; // = rtl::OUString::createFromAscii("");
+                rtl::OUString suGetname; // = rtl::OUString();
                 aBootstrap.getIniName( suGetname );
                 printUString( suGetname );
 
@@ -230,7 +230,7 @@ namespace rtl_Bootstrap
             {
                 Bootstrap aBootstrap;
                 rtl::OUString suValue;
-                rtl::OUString suValuename = rtl::OUString::createFromAscii( "SOLAR_JAVA" );
+                rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("SOLAR_JAVA"));
                 //aBootstrap.getFrom( suValuename, suValue );
                 aBootstrap.getFrom( suValuename, suValue );
                 sal_Char *  pStr = getenv("SOLAR_JAVA");
@@ -242,7 +242,7 @@ namespace rtl_Bootstrap
            {
            Bootstrap aBootstrap;
            rtl::OUString suValue;
-           rtl::OUString suValuename = rtl::OUString::createFromAscii( "SRC_ROOT" );
+           rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("SRC_ROOT"));
            //aBootstrap.getFrom( suValuename, suValue );
            aBootstrap.getFrom( suValuename, suValue );
            sal_Char *  pStr = getenv("SRC_ROOT");
@@ -263,7 +263,7 @@ namespace rtl_Bootstrap
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname );
                 rtl::OUString suGetname;
-                rtl::OUString suValuename = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
+                rtl::OUString suValuename (RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
                 aBootstrap.getFrom( suValuename, suGetname );
                 printUString( suGetname );
                 CPPUNIT_ASSERT_MESSAGE("get the value of a variable in ini file.", suGetname.getLength() != 0 );
@@ -275,8 +275,8 @@ namespace rtl_Bootstrap
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname );
                 rtl::OUString suGetname;
-                rtl::OUString suValuename = rtl::OUString::createFromAscii( "MY_VALUE" );
-                rtl::OUString myDefault = rtl::OUString::createFromAscii( "2" );
+                rtl::OUString suValuename(RTL_CONSTASCII_USTRINGPARAM("MY_VALUE"));
+                rtl::OUString myDefault(RTL_CONSTASCII_USTRINGPARAM("2"));
                 aBootstrap.getFrom( suValuename, suGetname, myDefault );
                 //printUString( suGetname );
                 CPPUNIT_ASSERT_MESSAGE("getFrom use default.", suGetname.compareTo( myDefault ) == 0 );
@@ -294,29 +294,29 @@ namespace rtl_Bootstrap
                 aBootstrap.getIniName( suGetIniName );
 
                 printUString(suGetIniName, "Current bootstrap file");
-                sal_Int32 nIndex = suGetIniName.indexOf(rtl::OUString::createFromAscii( "pseudo" ));
+                sal_Int32 nIndex = suGetIniName.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pseudo")));
                 CPPUNIT_ASSERT_MESSAGE("ini name must have 'pseudo' in name.", nIndex > 0);
 
                 // rtlBootstrapHandle bsHandle = aBootstrap.getHandle();
                 // CPPUNIT_ASSERT_MESSAGE("getHandle return NULL!", bsHandle != 0);
 
                 rtl::OUString suValue;
-                rtl::OUString suKeyName = rtl::OUString::createFromAscii( "FILE" );
+                rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("FILE"));
                 aBootstrap.getFrom( suKeyName, suValue );
                 printUString( suValue );
-                sal_Int32 nCompare = suValue.compareTo( rtl::OUString::createFromAscii("pseudo file") );
+                sal_Int32 nCompare = suValue.compareTo( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pseudo file")) );
 
                 CPPUNIT_ASSERT_MESSAGE("<Bootstrap('pseudo')>.getFrom('FILE', ...) result is unexpected.",  nCompare == 0);
             }
         void getFrom_004_1()
             {
                 // get the same key out of the default context
-                rtl::OUString suKeyName = rtl::OUString::createFromAscii( "FILE" );
+                rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("FILE"));
                 rtl::OUString suGetValue;
                 Bootstrap::get( suKeyName, suGetValue );
                 printUString( suGetValue );
 
-                CPPUNIT_ASSERT_MESSAGE("Bootstrap::get('FILE', ...)", suGetValue.compareTo( rtl::OUString::createFromAscii("testshl2 file") ) == 0 );
+                CPPUNIT_ASSERT_MESSAGE("Bootstrap::get('FILE', ...)", suGetValue.compareTo( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2 file")) ) == 0 );
             }
 
     /** helper function: return the child process's ret value( typedef sal_uInt32 oslProcessExitCode;)
@@ -327,17 +327,17 @@ namespace rtl_Bootstrap
          rtl::OUString suCWD = getModulePath();
             oslProcess hProcess = NULL;
            rtl::OUString suFileURL = suCWD;
-            suFileURL += rtl::OUString::createFromAscii("/") +  rtl::OUString::createFromAscii(process_name) ;
+            suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +  rtl::OUString::createFromAscii(process_name) ;
 #if defined(WNT) || defined(OS2)
-        suFileURL += rtl::OUString::createFromAscii(".exe");
+        suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
 #endif
             const int nParameterCount = 3;
             rtl_uString* pParameters[ nParameterCount ];
             OUString suFlag( OUString::createFromAscii(flag) );
-        OUString suEnv1( OUString::createFromAscii("-env:UNO_SERVICES=service.rdb"));
+        OUString suEnv1( RTL_CONSTASCII_USTRINGPARAM("-env:UNO_SERVICES=service.rdb") );
         OUString suIniname = t_getSourcePath("rtl");
         printUString( suIniname, "rtl path:");
-        //OUString suEnv2( OUString::createFromAscii("-env:MYENV=bootstrap_process"));
+        //OUString suEnv2( RTL_CONSTASCII_USTRINGPARAM("-env:MYENV=bootstrap_process") );
 
             pParameters[0] = suFlag.pData;
             pParameters[1] = suEnv1.pData;
@@ -473,7 +473,7 @@ namespace rtl_Bootstrap
                 Bootstrap::setIniFilename( suIniname );
                 //rtl_bootstrap_args_open( suIniname.pData );
                 rtl::OUString suGetname;
-                rtl::OUString suValuename = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
+                rtl::OUString suValuename(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
                 //aBootstrap.getFrom( suValuename, suGetname  );
                 Bootstrap::get( suValuename, suGetname  );
                 printUString( suGetname );
@@ -517,11 +517,11 @@ namespace rtl_Bootstrap
                 //rtl_bootstrap_get_iniName_from_handle( bsHandle, &iniName.pData );
 
                 rtl::OUString suValue;
-                rtl::OUString suKeyName = rtl::OUString::createFromAscii( "PSEUDOFILE" );
+                rtl::OUString suKeyName(RTL_CONSTASCII_USTRINGPARAM("PSEUDOFILE"));
                 rtl_bootstrap_get_from_handle(bsHandle, suKeyName.pData, &suValue.pData, NULL);
                 printUString( suValue);
 
-                CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!", suValue.equals( rtl::OUString::createFromAscii("be pseudo") ) == sal_True );
+                CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!", suValue.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("be pseudo")) ) == sal_True );
 
                 // CPPUNIT_ASSERT_MESSAGE("Can not use the handle which is returned by getHandle!",
                 //      suGetname.equalsIgnoreAsciiCase( iniName ) == sal_True );
@@ -550,8 +550,8 @@ namespace rtl_Bootstrap
                 //in ini fle, INHERITED_VALUE=inherited_value
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname);
-                rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
-                rtl::OUString suValue = rtl::OUString::createFromAscii( "ok" );
+                rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
+                rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("ok"));
                 // set to another value
                 Bootstrap::set( suName, suValue );
                 rtl::OUString suGetValue;
@@ -562,7 +562,7 @@ namespace rtl_Bootstrap
             {
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap myBootstrap( suIniname);
-                rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
+                rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
                 rtl::OUString suGetOrientValue;
                 Bootstrap::get( suName, suGetOrientValue);
                 // ??  INHERITED_VALUE = ok now, which is set in set_001
@@ -596,11 +596,11 @@ namespace rtl_Bootstrap
             {
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname);
-                rtl::OUString suMacro = rtl::OUString::createFromAscii( "$MYVAR/expand1" );
+                rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("$MYVAR/expand1"));
                 //printUString( suMacro );
                 //expandMacro now
                 aBootstrap.expandMacrosFrom( suMacro );
-                rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "src680_test/expand1" );
+                rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("src680_test/expand1"));
                 //printUString( suMacro );
                 CPPUNIT_ASSERT_MESSAGE("expandMacrosFrom failed.", suMacro.compareTo(suExpectedMacro) == 0 );
             }
@@ -619,19 +619,19 @@ namespace rtl_Bootstrap
                 t_print("inifile is:");
                 printUString( suIniname );
                 Bootstrap aBootstrap( suIniname) ;
-                  rtl::OUString suMacro = rtl::OUString::createFromAscii( "${" );         //rtlrc:Bootstrap:RTLVALUE}");
+                  rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("${"));         //rtlrc:Bootstrap:RTLVALUE}");
 
-     rtl::OUString aDirURL = OUString::createFromAscii( "$ORIGIN");
-     aDirURL += OUString::createFromAscii( "/");
-     aDirURL += OUString::createFromAscii( "rtl" );
+     rtl::OUString aDirURL(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN"));
+     aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+     aDirURL += OUString(RTL_CONSTASCII_USTRINGPARAM("rtl"));
 #if defined(WNT) || defined(OS2)
-    aDirURL += rtl::OUString::createFromAscii(".ini");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".ini"));
 #else
-    aDirURL += rtl::OUString::createFromAscii("rc");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rc"));
 #endif
 
                 suMacro += aDirURL;//t_getSourcePath("rtl");
-                suMacro += rtl::OUString::createFromAscii( "::RTLVALUE}");
+                suMacro += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("::RTLVALUE}"));
 
                 t_print("created macro is: ");
                 printUString( suMacro );
@@ -639,7 +639,7 @@ namespace rtl_Bootstrap
                 aBootstrap.expandMacrosFrom( suMacro );
                 t_print("expanded macro is:");
                 printUString( suMacro );
-                rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "qadev17" );
+                rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("qadev17"));
                 CPPUNIT_ASSERT_MESSAGE("failed, can't expand '${file:///.../" SAL_CONFIGFILE("rtl") "::RTLVALUE}' to 'qadev17'", suMacro.compareTo(suExpectedMacro) == 0 );
             }
         void expandMacrosFrom_002_1()
@@ -651,12 +651,12 @@ namespace rtl_Bootstrap
 
                 rtl::OUString suMacro;
                 // just a simple test, if this really work.
-                aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE2" ), suMacro );
+                aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE2")), suMacro );
                 t_print("SOFROMVALUE2:");
                 printUString( suMacro );
                 CPPUNIT_ASSERT_MESSAGE("'SOFROMVALUE2' seems to do not exist.", suMacro.getLength() > 0 );
 
-                aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE" ), suMacro );
+                aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE")), suMacro );
 
                 t_print("SOFROMVALUE:");
                 printUString( suMacro );
@@ -666,7 +666,7 @@ namespace rtl_Bootstrap
                 // t_print("expanded macro is:");
                 // aBootstrap.expandMacrosFrom( suMacro );
                 // printUString( suMacro );
-                rtl::OUString suExpectedMacro = rtl::OUString::createFromAscii( "src680_qadev" );
+                rtl::OUString suExpectedMacro(RTL_CONSTASCII_USTRINGPARAM("src680_qadev"));
                 CPPUNIT_ASSERT_MESSAGE("failed, can't expand '${" SAL_CONFIGFILE("rtl") "::SOVALUE}' to 'src680_qadev'", suMacro.compareTo(suExpectedMacro) == 0 );
             }
         void expandMacrosFrom_002_2()
@@ -680,18 +680,18 @@ namespace rtl_Bootstrap
                 Bootstrap aBootstrap( suIniname);
 
                 rtl::OUString suMacro;
-                aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE3" ), suMacro );
+                aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE3")), suMacro );
 
                 t_print("SOFROMVALUE3:");
                 printUString( suMacro );
 
-                if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file") ) == sal_True)
+                if (suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2_file")) ) == sal_True)
                 {
                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE3' is read from the wrong ini file.", 0 );
                 }
                 else
                 {
-                    CPPUNIT_ASSERT_MESSAGE("SOFROMVALUE3 should contain 'rtlfile'.", suMacro.equals(rtl::OUString::createFromAscii("rtlfile") ) == sal_True );
+                    CPPUNIT_ASSERT_MESSAGE("SOFROMVALUE3 should contain 'rtlfile'.", suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rtlfile")) ) == sal_True );
                 }
             }
 //? I don't know if this is a right test.
@@ -706,22 +706,22 @@ namespace rtl_Bootstrap
 //                 Bootstrap aBootstrap( suIniname);
 //
 //                 rtl::OUString suMacro;
-//                 aBootstrap.getFrom(rtl::OUString::createFromAscii( "SOFROMVALUE4" ), suMacro );
+//                 aBootstrap.getFrom(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SOFROMVALUE4")), suMacro );
 //
 //                 t_print("SOFROMVALUE4:");
 //                 printUString( suMacro );
 //
-//                 if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file") ) == sal_True)
+//                 if (suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2_file")) ) == sal_True)
 //                 {
 //                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' is read from the wrong section out of the wrong ini file.", 0 );
 //                 }
-//                 else if (suMacro.equals(rtl::OUString::createFromAscii("testshl2_file_other") ) == sal_True)
+//                 else if (suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("testshl2_file_other")) ) == sal_True)
 //                 {
 //                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' is read from the wrong ini file.", 0 );
 //                 }
 //                 else
 //                 {
-//                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' should contain 'rtlfile_other'.", suMacro.equals(rtl::OUString::createFromAscii("rtlfile_other") ) == sal_True );
+//                     CPPUNIT_ASSERT_MESSAGE("Value 'SOFROMVALUE4' should contain 'rtlfile_other'.", suMacro.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rtlfile_other")) ) == sal_True );
 //                 }
 //             }
         void expandMacrosFrom_003()
@@ -729,10 +729,10 @@ namespace rtl_Bootstrap
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname);
                 rtl::OUString suMacro[4];
-                suMacro[0] = rtl::OUString::createFromAscii( "$SYSUSERCONFIG" );
-                suMacro[1] = rtl::OUString::createFromAscii( "$SYSUSERHOME" );
-                suMacro[2] = rtl::OUString::createFromAscii( "$SYSBINDIR" );
-                suMacro[3] = rtl::OUString::createFromAscii( "$ORIGIN" );
+                suMacro[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG"));
+                suMacro[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERHOME"));
+                suMacro[2] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSBINDIR"));
+                suMacro[3] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$ORIGIN"));
 
                 for ( int i = 0; i < 4; i++ )
                 {
@@ -844,13 +844,13 @@ namespace rtl_Bootstrap
             {
                 rtl::OUString suIniname = t_getSourcePath(TESTSHL2_INI);
                 Bootstrap aBootstrap( suIniname) ;
-                rtl::OUString suMacro = rtl::OUString::createFromAscii( "$INHERITED_VALUE/well" );
+                rtl::OUString suMacro(RTL_CONSTASCII_USTRINGPARAM("$INHERITED_VALUE/well"));
                 Bootstrap::expandMacros( suMacro );
 
-        rtl::OUString suName = rtl::OUString::createFromAscii( "INHERITED_VALUE" );
+        rtl::OUString suName(RTL_CONSTASCII_USTRINGPARAM("INHERITED_VALUE"));
                 OUString suGetValue;
                 Bootstrap::get( suName, suGetValue );
-                suGetValue += OUString::createFromAscii( "/well" );
+                suGetValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/well"));
                 CPPUNIT_ASSERT_MESSAGE("expandMacros failed.", suGetValue.compareTo(suMacro) == 0 );
             }
 
@@ -929,9 +929,9 @@ static void create_rtlrc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
 #if defined(WNT) || defined(OS2)
-    aFileURL += rtl::OUString::createFromAscii("/rtl.ini");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtl.ini"));
 #else
-    aFileURL += rtl::OUString::createFromAscii("/rtlrc");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/rtlrc"));
 #endif
 
     rtl::OString sLines;
@@ -952,9 +952,9 @@ static void create_testshl2rc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
 #if defined(WNT) || defined(OS2)
-    aFileURL += rtl::OUString::createFromAscii("/testshl2.ini");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2.ini"));
 #else
-    aFileURL += rtl::OUString::createFromAscii("/testshl2rc");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testshl2rc"));
 #endif
     rtl::OString sLines;
     sLines += "[Bootstrap]\n";
@@ -994,9 +994,9 @@ static void create_pseudorc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
 #if defined(WNT) || defined(OS2)
-    aFileURL += rtl::OUString::createFromAscii("/pseudo.ini");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudo.ini"));
 #else
-    aFileURL += rtl::OUString::createFromAscii("/pseudorc");
+    aFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/pseudorc"));
 #endif
     rtl::OString sLines;
     sLines += "[Bootstrap]\n";
@@ -1011,9 +1011,9 @@ void create_bootstrap_processrc()
 {
     rtl::OUString aDirURL(getModulePath());
 #if defined(WNT) || defined(OS2)
-    aDirURL += rtl::OUString::createFromAscii("/bootstrap_process.ini");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_process.ini"));
 #else
-    aDirURL += rtl::OUString::createFromAscii("/bootstrap_processrc");
+    aDirURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/bootstrap_processrc"));
 #endif
     rtl::OString sLines;
     sLines += "[Bootstrap]\n";
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 2c140c36a306..4dffc21f56da 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -40,7 +40,7 @@ namespace rtl_locale
     // default locale for test purpose
     void setDefaultLocale()
     {
-        rtl::OLocale::setDefault(rtl::OUString::createFromAscii("de"), rtl::OUString::createFromAscii("DE"), /* rtl::OUString() */ rtl::OUString::createFromAscii("hochdeutsch") );
+        rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), /* rtl::OUString() */ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch")) );
     }
 
 class getDefault : public CppUnit::TestFixture
@@ -69,7 +69,7 @@ public:
 
     void getDefault_001()
     {
-        // rtl::OLocale::setDefault(rtl::OUString::createFromAscii("de"), rtl::OUString::createFromAscii("DE"), rtl::OUString());
+        // rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), rtl::OUString());
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         CPPUNIT_ASSERT_MESSAGE("locale must not null", aLocale.getData() != NULL);
     }
@@ -101,7 +101,7 @@ public:
     // insert your test code here.
     void setDefault_001()
     {
-        rtl::OLocale::setDefault(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString());
+        rtl::OLocale::setDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString());
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         CPPUNIT_ASSERT_MESSAGE("locale must not null", aLocale.getData() != NULL);
 
@@ -136,14 +136,14 @@ public:
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suLanguage = aLocale.getLanguage();
         t_print("Language: %s\n", rtl::OUStringToOString(suLanguage, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString::createFromAscii("de")));
+        CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
     }
     void getLanguage_002()
     {
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suLanguage = rtl_locale_getLanguage(aLocale.getData());
         t_print("Language: %s\n", rtl::OUStringToOString(suLanguage, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString::createFromAscii("de")));
+        CPPUNIT_ASSERT_MESSAGE("locale language must be 'de'", suLanguage.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de"))));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -175,14 +175,14 @@ public:
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suCountry = aLocale.getCountry();
         t_print("Country: %s\n", rtl::OUStringToOString(suCountry, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString::createFromAscii("DE")));
+        CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"))));
     }
     void getCountry_002()
     {
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suCountry = rtl_locale_getCountry(aLocale.getData());
         t_print("Country: %s\n", rtl::OUStringToOString(suCountry, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString::createFromAscii("DE")));
+        CPPUNIT_ASSERT_MESSAGE("locale country must be 'DE'", suCountry.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE"))));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -214,14 +214,14 @@ public:
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suVariant = aLocale.getVariant();
         t_print("Variant: %s\n", rtl::OUStringToOString(suVariant, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString::createFromAscii("hochdeutsch")));
+        CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch"))));
     }
     void getVariant_002()
     {
        rtl::OLocale aLocale = ::rtl::OLocale::getDefault();
         rtl::OUString suVariant = rtl_locale_getVariant(aLocale.getData());
         t_print("Variant: %s\n", rtl::OUStringToOString(suVariant, osl_getThreadTextEncoding()).getStr());
-        CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString::createFromAscii("hochdeutsch")));
+        CPPUNIT_ASSERT_MESSAGE("locale variant must be 'hochdeutsch'", suVariant.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("hochdeutsch"))));
     }
 
     // Change the following lines only, if you add, remove or rename
@@ -289,8 +289,8 @@ public:
     // insert your test code here.
     void equals_001()
     {
-        rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString());
-        rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"));
+        rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString());
+        rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")));
 
         sal_Bool bLocaleAreEqual = sal_False;
         bLocaleAreEqual = (aLocale1 == aLocale2);
@@ -300,8 +300,8 @@ public:
 
     void equals_002()
     {
-        rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"), rtl::OUString());
-        rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString::createFromAscii("en"), rtl::OUString::createFromAscii("US"));
+        rtl::OLocale aLocale1 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")), rtl::OUString());
+        rtl::OLocale aLocale2 = rtl::OLocale::registerLocale(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")));
 
         sal_Int32 nEqual = rtl_locale_equals(aLocale1.getData(), aLocale2.getData());
         t_print("rtl_locale_equals() result: %d\n", nEqual);
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index 34f1d0624dc8..e89a55c8e2e2 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -71,9 +71,9 @@ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = ""
 inline ::rtl::OUString getTempPath( void )
 {
 #ifdef UNX
-    rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///tmp/"));
+    rtl::OUString suDirURL( RTL_CONSTASCII_USTRINGPARAM("file:///tmp/") );
 #else /* Windows */
-    rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///c:/temp/"));
+    rtl::OUString suDirURL( RTL_CONSTASCII_USTRINGPARAM("file:///c:/temp/") );
 #endif
     return suDirURL;
 }
@@ -137,8 +137,8 @@ namespace rtl_logfile
                 rtl_logfile_trace("trace %d %d %d\n" , 1 , 2 ,3 );
 
                 rtl::OUString suFilePath = getTempPath();
-                suFilePath +=  rtl::OUString::createFromAscii("logfile1_") + getCurrentPID( );
-                suFilePath +=  rtl::OUString::createFromAscii(".log");
+                suFilePath +=  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("logfile1_")) + getCurrentPID( );
+                suFilePath +=  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".log"));
 
                 ::osl::FileBase::RC   nError1;
                 ::osl::File aTestFile( suFilePath );
@@ -226,8 +226,8 @@ public:
             {
                 t_print( "\n#Do some clean-ups ... only delete logfile1_*.log here!\n" );
                 rtl::OUString suFilePath = getTempPath();
-                suFilePath +=  rtl::OUString::createFromAscii("logfile1_") + getCurrentPID( );
-                suFilePath +=  rtl::OUString::createFromAscii(".log");
+                suFilePath +=  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("logfile1_")) + getCurrentPID( );
+                suFilePath +=  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".log"));
 
                 //if ( ifFileExist( suFilePath )  == sal_True )
                 ::osl::FileBase::RC nError1;
diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx
index 55b1f62cd9a4..d55e60e94e45 100644
--- a/sal/qa/rtl/ostring/rtl_string.cxx
+++ b/sal/qa/rtl/ostring/rtl_string.cxx
@@ -114,7 +114,7 @@ namespace rtl_string
 
         void convertUStringToString_001()
             {
-                rtl::OUString suString = rtl::OUString::createFromAscii("Hello");
+                rtl::OUString suString(RTL_CONSTASCII_USTRINGPARAM("Hello"));
                 rtl::OString sString;
                 sal_Bool bRet = rtl_convertUStringToString(&sString.pData, suString.getStr(), suString.getLength(), RTL_TEXTENCODING_ASCII_US, OUSTRING_TO_OSTRING_CVTFLAGS);
 
diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 4b05a027b57e..664b8b52fdea 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -59,7 +59,7 @@ namespace rtl_OUString
         /// test of OUString(rtl_uString*)
         void ctors_001()
             {
-                rtl::OUString *pStr = new rtl::OUString( rtl::OUString::createFromAscii("a String") );
+                rtl::OUString *pStr = new rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("a String") );
 
                 rtl::OUString aStrToTest(pStr->pData);
                 delete pStr;
@@ -69,7 +69,7 @@ namespace rtl_OUString
                 memset(pBuffer, 0, 2 * 8);
                 free(pBuffer);
 
-                sal_Bool bResult = aStrToTest.equals(rtl::OUString::createFromAscii("a String"));
+                sal_Bool bResult = aStrToTest.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a String")));
                 CPPUNIT_ASSERT_MESSAGE("String must not be empty",  bResult == sal_True);
             }
 
@@ -692,88 +692,88 @@ public:
     void lastIndexOf_test_oustring_offset_001()
         {
             // search for sun, start at the end, found (pos==0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring_offset(aStr, aSearchStr, 0, aStr.getLength());
         }
 
     void lastIndexOf_test_oustring_offset_002()
         {
             // search for sun, start at pos = 3, found (pos==0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring_offset(aStr, aSearchStr, 0, 3);
         }
 
     void lastIndexOf_test_oustring_offset_003()
         {
             // search for sun, start at pos = 2, found (pos==-1)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring_offset(aStr, aSearchStr, -1, 2);
         }
 
     void lastIndexOf_test_oustring_offset_004()
         {
             // search for sun, start at the end, found (pos==0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring_offset(aStr, aSearchStr, -1, -1);
         }
 
     void lastIndexOf_test_oustring_001()
         {
             // search for sun, found (pos==0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 0);
         }
 
     void lastIndexOf_test_oustring_002()
         {
             // search for sun, found (pos==4)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 4);
         }
 
     void lastIndexOf_test_oustring_003()
         {
             // search for sun, found (pos==8)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 8);
         }
 
     void lastIndexOf_test_oustring_004()
         {
             // search for sun, found (pos==8)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 8);
         }
 
     void lastIndexOf_test_oustring_005()
         {
             // search for sun, found (pos==4)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun su");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun su"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, 4);
         }
 
     void lastIndexOf_test_oustring_006()
         {
             // search for sun, found (pos==-1)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the su su");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("sun");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the su su"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("sun"));
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
     void lastIndexOf_test_oustring_007()
         {
             // search for earth, not found (-1)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the su su");
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("earth");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the su su"));
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("earth"));
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
@@ -781,7 +781,7 @@ public:
         {
             // search for earth, not found (-1)
             rtl::OUString aStr = rtl::OUString();
-            rtl::OUString aSearchStr = rtl::OUString::createFromAscii("earth");
+            rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("earth"));
             lastIndexOf_oustring(aStr, aSearchStr, -1);
         }
 
@@ -797,7 +797,7 @@ public:
     void lastIndexOf_test_salunicode_001()
         {
             // search for 's', found (19)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode suChar = L's';
             lastIndexOf_salunicode(aStr, suChar, 19);
         }
@@ -805,7 +805,7 @@ public:
     void lastIndexOf_test_salunicode_002()
         {
             // search for 'x', not found (-1)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode suChar = L'x';
             lastIndexOf_salunicode(aStr, suChar, -1);
         }
@@ -813,21 +813,21 @@ public:
     void lastIndexOf_test_salunicode_offset_001()
         {
             // search for 's', start from pos last char, found (19)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode cuChar = L's';
             lastIndexOf_salunicode_offset(aStr, cuChar, 19, aStr.getLength());
         }
     void lastIndexOf_test_salunicode_offset_002()
         {
             // search for 's', start pos is last occur from search behind, found (17)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode cuChar = L's';
             lastIndexOf_salunicode_offset(aStr, cuChar, 17, 19);
         }
     void lastIndexOf_test_salunicode_offset_003()
         {
             // search for 't', start pos is 1, found (0)
-            rtl::OUString aStr = rtl::OUString::createFromAscii("the sun sun java system");
+            rtl::OUString aStr(RTL_CONSTASCII_USTRINGPARAM("the sun sun java system"));
             sal_Unicode cuChar = L't';
             lastIndexOf_salunicode_offset(aStr, cuChar, 0, 1);
         }
@@ -886,66 +886,66 @@ public:
 
     void getToken_001()
         {
-            rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;b");
+            rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;b"));
 
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_002()
         {
-            rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;b.c");
+            rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;b.c"));
 
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'c'", suToken.equals(rtl::OUString::createFromAscii("c")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'c'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("c"))) == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_003()
         {
-            rtl::OUString suTokenStr = rtl::OUString::createFromAscii("a;;b");
+            rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("a;;b"));
 
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString::createFromAscii("a")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'a'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("a"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.getLength() == 0);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, ';', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString::createFromAscii("b")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be a 'b'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("b"))) == sal_True);
             CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1);
         }
 
     void getToken_004()
         {
-            rtl::OUString suTokenStr = rtl::OUString::createFromAscii("longer.then.ever.");
+            rtl::OUString suTokenStr(RTL_CONSTASCII_USTRINGPARAM("longer.then.ever."));
 
             sal_Int32 nIndex = 0;
 
             rtl::OUString suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be 'longer'", suToken.equals(rtl::OUString::createFromAscii("longer")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be 'longer'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("longer"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be 'then'", suToken.equals(rtl::OUString::createFromAscii("then")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be 'then'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("then"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
-            CPPUNIT_ASSERT_MESSAGE("Token should be 'ever'", suToken.equals(rtl::OUString::createFromAscii("ever")) == sal_True);
+            CPPUNIT_ASSERT_MESSAGE("Token should be 'ever'", suToken.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ever"))) == sal_True);
 
             /* rtl::OUString */ suToken = suTokenStr.getToken( 0, '.', nIndex );
             CPPUNIT_ASSERT_MESSAGE("Token should be empty", suToken.getLength() == 0);
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index ccc161ec9b01..f0cd05c3e4f6 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -59,7 +59,7 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_compare( aStr1.getStr(), NULL);
                 // should not GPF
             }
@@ -74,8 +74,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
 
                 sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -83,8 +83,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ."));
 
                 sal_Int32 nValue = rtl_ustr_compare( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -115,7 +115,7 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
             }
         void compare_001()
@@ -129,8 +129,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal.", nValue == 0);
@@ -138,8 +138,8 @@ namespace rtl_ustr
 
         void compare_002_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("LINE MUST BE EQUAL.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("LINE MUST BE EQUAL."));
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings are equal (if case insensitve).", nValue == 0);
@@ -147,8 +147,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ."));
 
                 sal_Int32 nValue = rtl_ustr_compareIgnoreAsciiCase( aStr1.getStr(), aStr2.getStr());
                 CPPUNIT_ASSERT_MESSAGE("compare failed, strings differ.", nValue != 0);
@@ -181,7 +181,7 @@ namespace rtl_ustr
 
         void compare_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0, 1);
             }
         void compare_001()
@@ -195,8 +195,8 @@ namespace rtl_ustr
 
         void compare_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -206,8 +206,8 @@ namespace rtl_ustr
 
         void compare_002_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("LINE MUST BE EQUAL.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("LINE MUST BE EQUAL."));
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -217,8 +217,8 @@ namespace rtl_ustr
 
         void compare_003()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ."));
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -228,8 +228,8 @@ namespace rtl_ustr
 
         void compare_004()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must differ.");
-                rtl::OUString aStr2 = rtl::OUString::createFromAscii("Line foo bar, ok, differ.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
+                rtl::OUString aStr2(RTL_CONSTASCII_USTRINGPARAM("Line foo bar, ok, differ."));
 
                 sal_Int32 nValue = rtl_ustr_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(),
                                                                                        aStr2.getStr(), aStr2.getLength(),
@@ -321,7 +321,7 @@ namespace rtl_ustr
 
         void indexOfChar_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfChar.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfChar."));
 
                 sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'L' );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
@@ -338,7 +338,7 @@ namespace rtl_ustr
 
         void indexOfChar_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfChar.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfChar."));
                 sal_Int32 nIndex = rtl_ustr_indexOfChar( aStr1.getStr(), 'y' );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -367,7 +367,7 @@ namespace rtl_ustr
 
         void lastIndexOfChar_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfChar.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfChar."));
 
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'C' );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 22);
@@ -384,7 +384,7 @@ namespace rtl_ustr
 
         void lastIndexOfChar_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfChar.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfChar."));
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfChar( aStr1.getStr(), 'y' );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -415,35 +415,35 @@ namespace rtl_ustr
 
         void indexOfStr_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr."));
                 rtl_ustr_indexOfStr( aStr1.getStr(), 0 );
             }
 
         void indexOfStr_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr."));
 
-                rtl::OUString suSearch = rtl::OUString::createFromAscii("Line");
+                rtl::OUString suSearch(RTL_CONSTASCII_USTRINGPARAM("Line"));
                 sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
 
-                /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("for");
+                /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("for"));
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 5);
 
-                /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("a");
+                /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("a"));
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 9);
 
-                /* rtl::OUString */ suSearch = rtl::OUString::createFromAscii("a index");
+                /* rtl::OUString */ suSearch(RTL_CONSTASCII_USTRINGPARAM("a index"));
                 /* sal_Int32 */ nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex ==9);
             }
 
         void indexOfStr_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a indexOfStr.");
-                rtl::OUString suSearch = rtl::OUString::createFromAscii("not exist");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a indexOfStr."));
+                rtl::OUString suSearch(RTL_CONSTASCII_USTRINGPARAM("not exist"));
                 sal_Int32 nIndex = rtl_ustr_indexOfStr( aStr1.getStr(), suSearch );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -473,31 +473,31 @@ namespace rtl_ustr
 
         void lastIndexOfStr_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr."));
                 rtl_ustr_lastIndexOfStr( aStr1.getStr(), NULL );
             }
 
         void lastIndexOfStr_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr = rtl::OUString::createFromAscii("Index");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr."));
+                rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("Index"));
 
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 15);
 
-                /* rtl::OString */ aSearchStr = rtl::OUString::createFromAscii("Line");
+                /* rtl::OString */ aSearchStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line"));
                 /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
 
-                /* rtl::OString */ aSearchStr = rtl::OUString::createFromAscii("");
+                /* rtl::OString */ aSearchStr = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""));
                 /* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1);
             }
 
         void lastIndexOfStr_002()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr = rtl::OUString::createFromAscii("foo");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr."));
+                rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("foo"));
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1 );
@@ -505,8 +505,8 @@ namespace rtl_ustr
 
         void lastIndexOfStr_003()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line for a lastIndexOfStr.");
-                rtl::OUString aSearchStr = rtl::OUString::createFromAscii("O");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line for a lastIndexOfStr."));
+                rtl::OUString aSearchStr(RTL_CONSTASCII_USTRINGPARAM("O"));
                 sal_Int32 nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
 
                 CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 20 );
@@ -537,8 +537,8 @@ namespace rtl_ustr
 
         void replaceChar_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("replace char.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("ruplacu char.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("replace char."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("ruplacu char."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc( nLength + sizeof(sal_Unicode)); // length + 1 (null terminator)
@@ -580,8 +580,8 @@ namespace rtl_ustr
             }
         void replaceChar_WithLength_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("replace char.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("ruplace char.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("replace char."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("ruplace char."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -597,8 +597,8 @@ namespace rtl_ustr
 
         void replaceChar_WithLength_002()
             {
-                rtl::OUString aStr1       = rtl::OUString::createFromAscii("eeeeeeeeeeeee");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("uuuuuueeeeeee");
+                rtl::OUString aStr1      (RTL_CONSTASCII_USTRINGPARAM("eeeeeeeeeeeee"));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("uuuuuueeeeeee"));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);                 // no null terminator is need
@@ -638,8 +638,8 @@ namespace rtl_ustr
 
         void toAsciiLowerCase_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII LOWER CASE.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("change this to ascii lower case.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII LOWER CASE."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii lower case."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode) );  // we need to add '\0' so one more
@@ -676,8 +676,8 @@ namespace rtl_ustr
 
         void toAsciiLowerCase_WithLength_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII LOWER CASE.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("change thiS TO ASCII LOWER CASE.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII LOWER CASE."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("change thiS TO ASCII LOWER CASE."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -720,8 +720,8 @@ namespace rtl_ustr
 
         void toAsciiUpperCase_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("change this to ascii upper case.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -758,8 +758,8 @@ namespace rtl_ustr
 
         void toAsciiUpperCase_WithLength_001()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("change this to ascii lower case.");
-                rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIs to ascii lower case.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii lower case."));
+                rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIs to ascii lower case."));
 
                 sal_uInt32 nLength = aStr1.getLength() * sizeof(sal_Unicode);
                 sal_Unicode* pStr = (sal_Unicode*) malloc(nLength);
@@ -798,7 +798,7 @@ namespace rtl_ustr
 
         void trim_WithLength_000_1()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("  trim this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("  trim this"));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -810,7 +810,7 @@ namespace rtl_ustr
 
         void trim_WithLength_001()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("  trim this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("  trim this"));
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
             memcpy(pStr, suStr.getStr(), nLength);
@@ -824,7 +824,7 @@ namespace rtl_ustr
 
         void trim_WithLength_002()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("trim this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("trim this"));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -839,7 +839,7 @@ namespace rtl_ustr
 
         void trim_WithLength_003()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("     trim   this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("     trim   this"));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -853,7 +853,7 @@ namespace rtl_ustr
 
         void trim_WithLength_004()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("\r\n\t \n\r    trim  \n this");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("\r\n\t \n\r    trim  \n this"));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -867,7 +867,7 @@ namespace rtl_ustr
 
         void trim_WithLength_005()
         {
-            rtl::OUString suStr = rtl::OUString::createFromAscii("\r\n\t \n\r    trim \t this \n\r\t\t     ");
+            rtl::OUString suStr(RTL_CONSTASCII_USTRINGPARAM("\r\n\t \n\r    trim \t this \n\r\t\t     "));
 
             sal_uInt32 nLength = suStr.getLength() * sizeof(sal_Unicode);
             sal_Unicode *pStr = (sal_Unicode*)malloc(nLength);
@@ -1022,13 +1022,13 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), aStr1.getLength(), NULL, 0);
                 // should not GPF
             }
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_000_2()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                 "Line is shorter.";
                 rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr(), 0);
                 // should not GPF
@@ -1044,7 +1044,7 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength());
@@ -1053,7 +1053,7 @@ namespace rtl_ustr
 
         void ascii_shortenedCompareIgnoreAsciiCase_WithLength_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 =                                  "Line must be differ and longer.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr(), sStr2.getLength());
@@ -1088,13 +1088,13 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), 0, NULL);
                 // should not GPF
             }
         void ascii_compareIgnoreAsciiCase_WithLength_000_2()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                 "Line is shorter.";
                 rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( aStr1.getStr(), sStr2.getLength(), sStr2.getStr());
                 // should not GPF
@@ -1110,7 +1110,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr());
@@ -1119,7 +1119,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_WithLength_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 =                                  "Line must be differ and longer.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( suStr1.getStr(), suStr1.getLength(), sStr2.getStr());
@@ -1154,7 +1154,7 @@ namespace rtl_ustr
 
         void ascii_compare_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_compare( aStr1.getStr(), NULL);
                 // should not GPF
             }
@@ -1169,7 +1169,7 @@ namespace rtl_ustr
 
         void ascii_compare_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr());
@@ -1178,7 +1178,7 @@ namespace rtl_ustr
 
         void ascii_compare_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compare( suStr1.getStr(), sStr2.getStr());
@@ -1212,7 +1212,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
                 // should not GPF
             }
@@ -1227,7 +1227,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1236,7 +1236,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002_1()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal, when ignore case.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal, when ignore case."));
                 rtl::OString sStr2 =                                 "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1245,7 +1245,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1256,8 +1256,8 @@ namespace rtl_ustr
 
         // void ascii_compareIgnoreAsciiCase_001()
         //     {
-        //         rtl::OUString suStr1 = rtl::OUString::createFromAscii("change this to ascii upper case.");
-        //         rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE.");
+        //         rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case."));
+        //         rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE."));
         //
         //         sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode);
         //         sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
@@ -1310,7 +1310,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_000_1()
             {
-                rtl::OUString aStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString aStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl_ustr_ascii_compareIgnoreAsciiCase( aStr1.getStr(), NULL);
                 // should not GPF
             }
@@ -1325,7 +1325,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal."));
                 rtl::OString sStr2 =                                  "Line must be equal.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1334,7 +1334,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_002_1()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must be equal, when ignore case.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must be equal, when ignore case."));
                 rtl::OString sStr2 =                                 "LINE MUST BE EQUAL, WHEN IGNORE CASE.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1343,7 +1343,7 @@ namespace rtl_ustr
 
         void ascii_compareIgnoreAsciiCase_003()
             {
-                rtl::OUString suStr1 = rtl::OUString::createFromAscii("Line must differ.");
+                rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("Line must differ."));
                 rtl::OString sStr2 = "Line foo bar, ok, differ.";
 
                 sal_Int32 nValue = rtl_ustr_ascii_compareIgnoreAsciiCase( suStr1.getStr(), sStr2.getStr());
@@ -1354,8 +1354,8 @@ namespace rtl_ustr
 
         // void ascii_compareIgnoreAsciiCase_001()
         //     {
-        //         rtl::OUString suStr1 = rtl::OUString::createFromAscii("change this to ascii upper case.");
-        //         rtl::OUString aShouldStr1 = rtl::OUString::createFromAscii("CHANGE THIS TO ASCII UPPER CASE.");
+        //         rtl::OUString suStr1(RTL_CONSTASCII_USTRINGPARAM("change this to ascii upper case."));
+        //         rtl::OUString aShouldStr1(RTL_CONSTASCII_USTRINGPARAM("CHANGE THIS TO ASCII UPPER CASE."));
         //
         //         sal_uInt32 nLength = suStr1.getLength() * sizeof(sal_Unicode);
         //         sal_Unicode* pStr = (sal_Unicode*) malloc(nLength + sizeof(sal_Unicode)); // length + null terminator
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index 0372551d3225..c69436467427 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -69,7 +69,7 @@ inline ::rtl::OUString getModulePath( void )
     printUString(suDirPath, "modulePath:");
     suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') );
     suDirPath = suDirPath.copy( 0, suDirPath.lastIndexOf('/') + 1);
-    suDirPath += rtl::OUString::createFromAscii("bin");
+    suDirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin"));
     return suDirPath;
 }
 
@@ -92,9 +92,9 @@ public:
     void getAppCommandArg_001()
     {
 #if defined(WNT) || defined(OS2)
-    const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("child_process.exe");
+    const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process.exe"));
 #else
-    const rtl::OUString EXECUTABLE_NAME = rtl::OUString::createFromAscii("child_process");
+    const rtl::OUString EXECUTABLE_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process"));
 #endif
         rtl::OUString suCWD = getModulePath();
         // rtl::OUString suCWD2 = getExecutableDirectory();
@@ -113,7 +113,7 @@ public:
         pParameters[3] = suParam3.pData;
 
         rtl::OUString suFileURL = suCWD;
-        suFileURL += rtl::OUString::createFromAscii("/");
+        suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         suFileURL += EXECUTABLE_NAME;
 
         oslProcessError osl_error = osl_executeProcess(
@@ -229,9 +229,9 @@ public:
     void getGlobalProcessId_002()
     {
 #if defined(WNT) || defined(OS2)
-    const rtl::OUString EXEC_NAME = rtl::OUString::createFromAscii("child_process_id.exe");
+    const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id.exe"));
 #else
-    const rtl::OUString EXEC_NAME = rtl::OUString::createFromAscii("child_process_id");
+    const rtl::OUString EXEC_NAME(RTL_CONSTASCII_USTRINGPARAM("child_process_id"));
 #endif
         sal_uInt8 pTargetUUID1[16];
         rtl_getGlobalProcessId( pTargetUUID1 );
@@ -243,7 +243,7 @@ public:
     rtl::OUString suCWD = getModulePath();
         oslProcess hProcess = NULL;
        rtl::OUString suFileURL = suCWD;
-        suFileURL += rtl::OUString::createFromAscii("/");
+        suFileURL += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
         suFileURL += EXEC_NAME;
     oslFileHandle* pChildOutputRead = new oslFileHandle();
         oslProcessError osl_error = osl_executeProcess_WithRedirectedIO(
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 919aa04a24b4..741bab924e91 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -224,9 +224,9 @@ namespace Stringtest
         void test_UTF8_files()
             {
 #ifdef UNX
-                rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///tmp/atestdir"));
+                rtl::OUString suDirURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///tmp/atestdir")));
 #else /* Windows */
-                rtl::OUString suDirURL(rtl::OUString::createFromAscii("file:///c:/temp/atestdir"));
+                rtl::OUString suDirURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///c:/temp/atestdir")));
 #endif
                 osl::Directory aDir(suDirURL);
                 aDir.open();
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 880e326ee562..63778adb9112 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -76,14 +76,14 @@ void oldtests::test_OUString()
     //          "Mein erster RTL OUString\n"
     //           |    |    |    |    |
     //  Index    0    5    10   15   20
-    OUString s1(OUString::createFromAscii("Mein erster RTL OUString\n"));
-    TEST_ENSURE( s1 == OUString::createFromAscii("Mein erster RTL OUString\n"), "test_OWString error 1");
+    OUString s1(OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n")));
+    TEST_ENSURE( s1 == OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n")), "test_OWString error 1");
     TEST_ENSURE( s1.getLength() == 25, "test_OWString error 2");
 
     OUString s2 = s1;
     TEST_ENSURE( s2[16] == (sal_Unicode)'O', "test_OWString error 3");
     TEST_ENSURE( s2.equals(s1), "test_OWString error 4");
-    TEST_ENSURE( OUString( OUString::createFromAscii("hallo")) == OUString::createFromAscii( "hallo"), "test_OWString error 4");
+    TEST_ENSURE( OUString( OUString(RTL_CONSTASCII_USTRINGPARAM("hallo"))) == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 4");
     TEST_ENSURE( s2.indexOf((sal_Unicode)'O') == 16, "test_OWString error 5");
     TEST_ENSURE( s2.indexOf((sal_Unicode)'O', 5) == 16, "test_OWString error 5a");
     TEST_ENSURE( s2.lastIndexOf((sal_Unicode)'r') == 20, "test_OWString error 6");
@@ -98,24 +98,24 @@ void oldtests::test_OUString()
     //           |    |    |    |    |    |    |    |    |    |    |    |
     //  Index    0    5    10   15   20   25   30   35   40   45   50   55
     OUString s3 = s2.copy(0, s2.getLength() - 1);
-    OUString s4 = s3.concat( OUString::createFromAscii(" ist ein String aus der RTL Library\n") );
+    OUString s4 = s3.concat( OUString(RTL_CONSTASCII_USTRINGPARAM(" ist ein String aus der RTL Library\n")) );
     TEST_ENSURE( s4.getLength() == 60, "test_OWString error 11");
 
     s1 = s4.copy(0, 39);
     OUString s5;
-    s5 = s1 + OUString::createFromAscii( " aus der RTL Library\n" );
+    s5 = s1 + OUString(RTL_CONSTASCII_USTRINGPARAM(" aus der RTL Library\n"));
     TEST_ENSURE( s5.compareTo(s4) == 0 , "test_OWString error 12");
-    TEST_ENSURE( s5.indexOf(OUString::createFromAscii("RTL")) == 12, "test_OWString error 13");
-    TEST_ENSURE( s5.lastIndexOf(OUString::createFromAscii("RTL")) == 48, "test_OWString error 13");
+    TEST_ENSURE( s5.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("RTL"))) == 12, "test_OWString error 13");
+    TEST_ENSURE( s5.lastIndexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("RTL"))) == 48, "test_OWString error 13");
 
     sal_Bool b = sal_False;
     OUString s6 = s5.valueOf(b);
-//  TEST_ENSURE( s6.compareTo(OUString::createFromAscii("False")) == 0, "test_OWString error 14");
+//  TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("False"))) == 0, "test_OWString error 14");
     s6 = s5.valueOf((sal_Unicode)'H');
-    TEST_ENSURE( s6.compareTo(OUString::createFromAscii("H")) == 0, "test_OWString error 15");
+    TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("H"))) == 0, "test_OWString error 15");
     sal_Int32 n = 123456789L;
     s6 = s5.valueOf(n);
-    TEST_ENSURE( s6.compareTo(OUString::createFromAscii("123456789")) == 0, "test_OWString error 16");
+    TEST_ENSURE( s6.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("123456789"))) == 0, "test_OWString error 16");
 
 #ifndef SAL_OS2
 #ifdef SAL_UNX
@@ -127,92 +127,92 @@ void oldtests::test_OUString()
     sal_Int64 m = -3223372036854775807;
 #endif
     s6 = s5.valueOf(m);
-    TEST_ENSURE( s6.compareTo( OUString::createFromAscii( "-3223372036854775807" ) ) == 0, "test_OWString error 17");
+    TEST_ENSURE( s6.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("-3223372036854775807")) ) == 0, "test_OWString error 17");
 #endif
 
 // LLA: locale tests removed        ::rtl::OLocale locale = ::rtl::OLocale::getDefault();
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s61(OUString::createFromAscii("HaLLo"));
+// LLA: locale tests removed    OUString s61(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo")));
 // LLA: locale tests removed    s61 = s61.toLowerCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17a");
+// LLA: locale tests removed    TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 17a");
 // LLA: locale tests removed    s61 = s61.toUpperCase();
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("HALLO"), "test_OWString error 17b");
+// LLA: locale tests removed    TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO")), "test_OWString error 17b");
 // LLA: locale tests removed    s61 = s61.toLowerCase();
-// LLA: locale tests removed    TEST_ENSURE( s61 == OUString::createFromAscii("hallo"), "test_OWString error 17c");
+// LLA: locale tests removed    TEST_ENSURE( s61 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 17c");
 // LLA: locale tests removed
-// LLA: locale tests removed    ::rtl::OLocale::setDefault( OUString::createFromAscii( "de" ), OUString::createFromAscii( "DE" ), OUString() );
+// LLA: locale tests removed    ::rtl::OLocale::setDefault( OUString(RTL_CONSTASCII_USTRINGPARAM("de")), OUString(RTL_CONSTASCII_USTRINGPARAM("DE")), OUString() );
 // LLA: locale tests removed    locale = OLocale::getDefault();
 // LLA: locale tests removed
 // LLA: locale tests removed    // AB, 24.3.2000, removed NAMESPACE_RTL(OLocale)::getENGLISH() and error 18
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s7(OUString::createFromAscii("HaLLo"));
+// LLA: locale tests removed    OUString s7(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo")));
 // LLA: locale tests removed    s7 = s7.toLowerCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 == OUString::createFromAscii("hallo"), "test_OWString error 19");
+// LLA: locale tests removed    TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo")), "test_OWString error 19");
 // LLA: locale tests removed    s7 = s7.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 == OUString::createFromAscii("HALLO"), "test_OWString error 20");
+// LLA: locale tests removed    TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO")), "test_OWString error 20");
 // LLA: locale tests removed
-// LLA: locale tests removed    OUString s8(OUString::createFromAscii("HaLLo ICH BIn eIn "));
+// LLA: locale tests removed    OUString s8(OUString(RTL_CONSTASCII_USTRINGPARAM("HaLLo ICH BIn eIn ")));
 // LLA: locale tests removed    s8 += OUString::valueOf( (sal_Unicode)0xDF );
-// LLA: locale tests removed    locale = OLocale::registerLocale( OUString::createFromAscii("tr"), OUString::createFromAscii("TR"), OUString());
+// LLA: locale tests removed    locale = OLocale::registerLocale( OUString(RTL_CONSTASCII_USTRINGPARAM("tr")), OUString(RTL_CONSTASCII_USTRINGPARAM("TR")), OUString());
 // LLA: locale tests removed    s8 = s8.toLowerCase(locale);
 // LLA: locale tests removed    s8 = s8.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s8 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 21");
+// LLA: locale tests removed    TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")), "test_OWString error 21");
 // LLA: locale tests removed
-// LLA: locale tests removed    s7 = OUString::createFromAscii("Hallo ich bIn ein I");
+// LLA: locale tests removed    s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo ich bIn ein I"));
 // LLA: locale tests removed    s7 = s8.toUpperCase(locale);
-// LLA: locale tests removed    TEST_ENSURE( s7 != OUString::createFromAscii("HALLO ICH BIN EIN I"), "test_OWString error 21.b");
+// LLA: locale tests removed    TEST_ENSURE( s7 != OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN I")), "test_OWString error 21.b");
 
      OUString s7;
-    OUString s8(OUString::createFromAscii("HALLO ICH BIN EIN SS"));
-    s7 = OUString::createFromAscii("          ");
-    s8 = s7 + s8 + OUString::createFromAscii("          " );
-    TEST_ENSURE( s8 == OUString::createFromAscii("          HALLO ICH BIN EIN SS          "),
+    OUString s8(OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")));
+    s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("          "));
+    s8 = s7 + s8 + OUString(RTL_CONSTASCII_USTRINGPARAM("          "));
+    TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("          HALLO ICH BIN EIN SS          ")),
                   "test_OWString error 22");
 
     s7 = s8.trim();
-    TEST_ENSURE( s7 == OUString::createFromAscii("HALLO ICH BIN EIN SS"), "test_OWString error 23");
+    TEST_ENSURE( s7 == OUString(RTL_CONSTASCII_USTRINGPARAM("HALLO ICH BIN EIN SS")), "test_OWString error 23");
 //  TEST_ENSURE( wcscmp(s7.getStr(), L"HALLO ICH BIN EIN SS") == 0, "test_OWString error 24");
 
-    s7 = OUString::createFromAscii("Hallo");
-    s8 = OUString::createFromAscii("aber Hallo");
+    s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
+    s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("aber Hallo"));
 
     TEST_ENSURE( s7 < s8, "test_OWString error 25");
     TEST_ENSURE( s8 > s7, "test_OWString error 26");
     TEST_ENSURE( s7 != s8, "test_OWString error 27");
-    TEST_ENSURE( s7 != OUString::createFromAscii("blabla"), "test_OWString error 28");
-    TEST_ENSURE( OUString::createFromAscii("blabla") != s7, "test_OWString error 29");
+    TEST_ENSURE( s7 != OUString(RTL_CONSTASCII_USTRINGPARAM("blabla")), "test_OWString error 28");
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("blabla")) != s7, "test_OWString error 29");
 
-    s8 = OUString::createFromAscii("Hallo");
+    s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
     TEST_ENSURE( s7 <= s8, "test_OWString error 30");
     TEST_ENSURE( s7 >= s8, "test_OwString error 31");
 
     s8 = s8.replace((sal_Unicode)'l', (sal_Unicode)'r');
-    TEST_ENSURE( s8 == OUString::createFromAscii("Harro"), "test_OWString error 32");
+    TEST_ENSURE( s8 == OUString(RTL_CONSTASCII_USTRINGPARAM("Harro")), "test_OWString error 32");
 // LLA: len() unknown   TEST_ENSURE( s8.len() == 5, "test_OWString error 33");
 
     //       "Ich bin ein String mit einem A und C und vielen m, m, m, m"
     //        |    |    |    |    |    |    |    |    |    |    |    |
     //index   0    5    10   15   20   25   30   35   40   45   50   55
-    s8 = OUString::createFromAscii("Ich bin ein String mit einem A und C und vielen m, m, m, m");
+    s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("Ich bin ein String mit einem A und C und vielen m, m, m, m"));
 // LLA: no matching     TEST_ENSURE( s8.search((sal_Unicode)'I') == 0, "test_OWString error 34");
 // LLA: no matching     TEST_ENSURE( s8.search((sal_Unicode)'A') == 29, "test_OWString error 35");
-// LLA: no matching     s7 = OUString::createFromAscii("A und C");
+// LLA: no matching     s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("A und C"));
 // LLA: no matching     TEST_ENSURE( s8.search(s7) == 29, "test_OWString error 36");
-// LLA: no matching     TEST_ENSURE( s8.search(OUString::createFromAscii("mit einem A")) == 19, "test_OWString error 37");
+// LLA: no matching     TEST_ENSURE( s8.search(OUString(RTL_CONSTASCII_USTRINGPARAM("mit einem A"))) == 19, "test_OWString error 37");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("||token1|token2|token3||token4|token5||" );
+// LLA: no matching     s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("||token1|token2|token3||token4|token5||"));
 // LLA: no matching     TEST_ENSURE( s8.getTokenCount('|') == 10, "test_OWString error 38a");
 // LLA: no matching     TEST_ENSURE( s8.getToken(10,'|') == OUString(), "test_OWString error 39a");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("token1");
+// LLA: no matching     s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("token1"));
 // LLA: no matching     TEST_ENSURE( s8.getTokenCount('|') == 1, "test_OWString error 38b");
-// LLA: no matching     TEST_ENSURE( s8.getToken(0,'|') == OUString::createFromAscii("token1"), "test_OWString error 39b");
+// LLA: no matching     TEST_ENSURE( s8.getToken(0,'|') == OUString(RTL_CONSTASCII_USTRINGPARAM("token1")), "test_OWString error 39b");
 // LLA: no matching     TEST_ENSURE( s8.getToken(-1,'|') == OUString(), "test_OWString error 39c");
 // LLA: no matching     TEST_ENSURE( s8.getToken(1,'|') == OUString(), "test_OWString error 39d");
 // LLA: no matching
-// LLA: no matching     s8 = OUString::createFromAscii("|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|");
+// LLA: no matching     s8 = OUString(RTL_CONSTASCII_USTRINGPARAM("|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|"));
 // LLA: no matching     TEST_ENSURE( s8.getTokenCount((sal_Unicode)'|') == 10, "test_OWString error 38");
-// LLA: no matching     TEST_ENSURE( s8.getToken(3, (sal_Unicode)'|') == OUString::createFromAscii("hallo3"), "test_OWString error 39");
+// LLA: no matching     TEST_ENSURE( s8.getToken(3, (sal_Unicode)'|') == OUString(RTL_CONSTASCII_USTRINGPARAM("hallo3")), "test_OWString error 39");
 
 // LLA: removed due to the fact, this is not a clean test!
 
@@ -220,48 +220,48 @@ void oldtests::test_OUString()
 // LLA:     s7 += s8;
 // LLA:     TEST_ENSURE( s7 == s8, "test_OWString error 40");
 // LLA:
-// LLA:     s7 = s8.replaceAt(8, 6, OUString::createFromAscii("mmmmmmmmmm"));
+// LLA:     s7 = s8.replaceAt(8, 6, OUString(RTL_CONSTASCII_USTRINGPARAM("mmmmmmmmmm")));
 // LLA:     TEST_ENSURE( s7.getLength() == 61, "test_OWString error 41");
 // LLA:
 // LLA:     s8 = s7.replaceAt(8, 11, OUString());
 // LLA:     TEST_ENSURE( s8.getLength() == 50, "test_OWString error 42");
 // LLA:
-// LLA:     s7 = s8.replaceAt(8, 0, OUString::createFromAscii("hallo2|"));
+// LLA:     s7 = s8.replaceAt(8, 0, OUString(RTL_CONSTASCII_USTRINGPARAM("hallo2|")));
 // LLA:     TEST_ENSURE( s7.getLength() == 57, "test_OWString error 43");
 // LLA:
 // LLA:     sal_Int32 pos = 0;
-// LLA:     while ((pos = s7.indexOf(OUString::createFromAscii("|"))) >= 0)
+// LLA:     while ((pos = s7.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("|")))) >= 0)
 // LLA:     {
-// LLA:         s8 = s7.replaceAt(pos, 1, OUString::createFromAscii("**"));
+// LLA:         s8 = s7.replaceAt(pos, 1, OUString(RTL_CONSTASCII_USTRINGPARAM("**")));
 // LLA:         s7 = s8;
 // LLA:     }
 // LLA:     TEST_ENSURE( s7.getLength() == 66, "test_OWString error 44");
 
-    TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("bbb" ) ) < 0, "test_OWString error 46" );
-    TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("aaa" ) ) == 0, "test_OWString error 46" );
-    TEST_ENSURE( OUString::createFromAscii("bbb" ).compareTo( OUString::createFromAscii("aaa" ) ) > 0, "test_OWString error 47" );
-    TEST_ENSURE( OUString::createFromAscii("aaaa" ).compareTo( OUString::createFromAscii("bbb" ) ) < 0, "test_OWString error 48" );
-    TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("bbbb" ) ) < 0, "test_OWString error 49" );
-    TEST_ENSURE( OUString::createFromAscii("aaa" ).compareTo( OUString::createFromAscii("aaaa" ) ) < 0, "test_OWString error 50" );
-    TEST_ENSURE( OUString::createFromAscii("aaaa" ).compareTo( OUString::createFromAscii("aaa" ) ) > 0, "test_OWString error 51" );
-    TEST_ENSURE( OUString::createFromAscii("bbbb" ).compareTo( OUString::createFromAscii("bbb" ) ) > 0, "test_OWString error 52" );
-    TEST_ENSURE( OUString::createFromAscii("bbb" ) == OUString::createFromAscii("bbb" ), "test_OWString error 53" );
-    TEST_ENSURE( OUString::createFromAscii("bbb" ) == OUString::createFromAscii("bbb" ), "test_OWString error 54" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) < 0, "test_OWString error 46" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) == 0, "test_OWString error 46" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) > 0, "test_OWString error 47" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) < 0, "test_OWString error 48" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbbb")) ) < 0, "test_OWString error 49" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")) ) < 0, "test_OWString error 50" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("aaaa")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("aaa")) ) > 0, "test_OWString error 51" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbbb")).compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) ) > 0, "test_OWString error 52" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) == OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")), "test_OWString error 53" );
+    TEST_ENSURE( OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")) == OUString(RTL_CONSTASCII_USTRINGPARAM("bbb")), "test_OWString error 54" );
 
     {
-        OUString uStr = OUString::createFromAscii( "Hallo" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Hallo"), 5 ) == 0, "test_OWString error 54.2.1" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Halloa"), 6 ) < 0 , "test_OWString error 54.2.2" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("1Hallo"), 6 ) > 0, "test_OWString error 54.2.3" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Aallo"), 5 ) > 0, "test_OWString error 54.2.4" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Halla"), 5 ) > 0, "test_OWString error 54.2.5" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Mallo"), 5 ) < 0, "test_OWString error 54.2.6" );
-        TEST_ENSURE( uStr.compareTo( OUString::createFromAscii("Hallp"), 5 ) < 0, "test_OWString error 54.2.7" );
+        OUString uStr = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo")), 5 ) == 0, "test_OWString error 54.2.1" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Halloa")), 6 ) < 0 , "test_OWString error 54.2.2" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("1Hallo")), 6 ) > 0, "test_OWString error 54.2.3" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Aallo")), 5 ) > 0, "test_OWString error 54.2.4" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Halla")), 5 ) > 0, "test_OWString error 54.2.5" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Mallo")), 5 ) < 0, "test_OWString error 54.2.6" );
+        TEST_ENSURE( uStr.compareTo( OUString(RTL_CONSTASCII_USTRINGPARAM("Hallp")), 5 ) < 0, "test_OWString error 54.2.7" );
     }
 
 #if OSL_DEBUG_LEVEL == 0
 //YD will fail copy assert on indexes, because ':' returns -1
-    s7 = OUString::createFromAscii("Hallo jetzt komm ich");
+    s7 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"));
     s8 = s7.copy(0, s7.indexOf((sal_Unicode)':'));
     TEST_ENSURE( s8.getLength() == 0, "test_OWString error 55");
     TEST_ENSURE( s8.compareTo(OUString()) == 0, "test_OWString error 56");
@@ -306,7 +306,7 @@ void oldtests::test_OUString()
     TEST_ENSURE( nCompareResult21_Len13 > 0, "test_OWString error 66" );
 
     {
-        OUString uStr = OUString::createFromAscii( "Hallo" );
+        OUString uStr = OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo"));
         TEST_ENSURE( uStr.equalsAsciiL( "Hallo", 5 ), "test_OWString error 66.1.1" );
         TEST_ENSURE( !uStr.equalsAsciiL( "Hallo1", 6 ), "test_OWString error 66.1.2" );
         TEST_ENSURE( !uStr.equalsAsciiL( "1Hallo", 6 ), "test_OWString error 66.1.3" );
@@ -323,14 +323,14 @@ void oldtests::test_OUString()
     }
 
     // toInt64
-    OUString s9( OUString::createFromAscii(" -3223372036854775807") );
+    OUString s9( OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807")) );
     sal_Int64 ln1 = s9.toInt64();
 #if (defined UNX) || (defined OS2)
     TEST_ENSURE( ln1 == -3223372036854775807LL, "test_OWString error 67" );
 #else
     TEST_ENSURE( ln1 == -3223372036854775807, "test_OWString error 67" );
 #endif
-    OUString s10( OUString::createFromAscii("13243A65f1H45") );
+    OUString s10( OUString(RTL_CONSTASCII_USTRINGPARAM("13243A65f1H45")) );
     sal_Int64 ln2 = s10.toInt64();
     TEST_ENSURE( ln2 == 13243, "test_OWString error 68" );
 
@@ -341,16 +341,16 @@ void oldtests::test_OUString()
     TEST_ENSURE( ln3 == 0x13243A65F1, "test_OWString error 69" );
 #endif
     // Exotic base
-    OUString s11( OUString::createFromAscii("H4A") );
+    OUString s11( OUString(RTL_CONSTASCII_USTRINGPARAM("H4A")) );
     sal_Int64 ln4 = s11.toInt64( 23 );
     TEST_ENSURE( ln4 == 23*23*17 + 4 * 23 + 10, "test_OWString error 70" );
 
     // toInt32
-    OUString s12( OUString::createFromAscii(" -220368507") );
+    OUString s12( OUString(RTL_CONSTASCII_USTRINGPARAM(" -220368507")) );
     sal_Int32 n1 = s12.toInt32();
     TEST_ENSURE( n1 == -220368507, "test_OWString error 71" );
 
-    OUString s13( OUString::createFromAscii("4423A61H45") );
+    OUString s13( OUString(RTL_CONSTASCII_USTRINGPARAM("4423A61H45")) );
     sal_Int64 n2 = s13.toInt32();
     TEST_ENSURE( n2 == 4423, "test_OWString error 72" );
 
@@ -376,13 +376,13 @@ void oldtests::test_OString2OUStringAndViceVersa()
 {
     OString s1("Hallo jetzt komm ich");
     OUString u1 = OStringToOUString(s1, RTL_TEXTENCODING_MS_1252);
-    TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 1" );
+    TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 1" );
     u1 = OStringToOUString(s1, RTL_TEXTENCODING_IBM_850);
-    TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 2" );
+    TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 2" );
     u1 = OStringToOUString(s1, RTL_TEXTENCODING_ISO_8859_15);
-    TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 3" );
+    TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 3" );
     u1 = OStringToOUString(s1, RTL_TEXTENCODING_ASCII_US);
-    TEST_ENSURE( u1.equals(OUString::createFromAscii("Hallo jetzt komm ich")), "test_OString2OWStringAndViceVersa error 4" );
+    TEST_ENSURE( u1.equals(OUString(RTL_CONSTASCII_USTRINGPARAM("Hallo jetzt komm ich"))), "test_OString2OWStringAndViceVersa error 4" );
 
     OString s2 = OUStringToOString(u1, RTL_TEXTENCODING_MS_1252);
     TEST_ENSURE( s2.equals("Hallo jetzt komm ich"), "test_OString2OWStringAndViceVersa error 5" );
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index fa03107e2a28..6f21cf655cac 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -159,29 +159,29 @@ void oldtests::test_OUStringBuffer()
     //          "Mein erster RTL OUString\n"
     //           |    |    |    |    |
     //  Index    0    5    10   15   20
-    OUString s1(OUString::createFromAscii("Mein erster RTL OUString\n"));
+    OUString s1(OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUString\n")));
 
     OUStringBuffer b1(s1);
 
     TEST_ENSURE( b1.getCapacity() == 16 + s1.getLength(), "test_OWStringBuffer error 1");
 
-    b1.insert(b1.getLength() - 1, OUString::createFromAscii("Buffer"));
-    s1 = OUString::createFromAscii("Mein erster RTL OUStringBuffer\n");
+    b1.insert(b1.getLength() - 1, OUString(RTL_CONSTASCII_USTRINGPARAM("Buffer")));
+    s1 = OUString(RTL_CONSTASCII_USTRINGPARAM("Mein erster RTL OUStringBuffer\n"));
     TEST_ENSURE( s1 == b1.getStr(), "test_OWStringBuffer error 2");
 
-    b1.insert(b1.getLength() - 1, OUString::createFromAscii(" ist viel zu gross fuer den alten Buffer"));
+    b1.insert(b1.getLength() - 1, OUString(RTL_CONSTASCII_USTRINGPARAM(" ist viel zu gross fuer den alten Buffer")));
     //TEST_ENSURE( b1.getCapacity() == b1.getLength(), "test_OWStringBuffer error 3");
 
     OUStringBuffer b2(30);
 
-    s1 = OUString::createFromAscii("false");
+    s1 = OUString(RTL_CONSTASCII_USTRINGPARAM("false"));
     sal_Bool b = sal_False;
     b2.append(b);
     TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 4");
 
     sal_Int32 n = 123456789L;
-    s1 += OUString::createFromAscii(" 123456789");
-    b2.append(OUString::createFromAscii(" "));
+    s1 += OUString(RTL_CONSTASCII_USTRINGPARAM(" 123456789"));
+    b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
     b2.append(n);
     TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 5");
 
@@ -194,8 +194,8 @@ void oldtests::test_OUStringBuffer()
 #else
     sal_Int64 m = -3223372036854775807;
 #endif
-    s1 += OUString::createFromAscii(" -3223372036854775807");
-    b2.append(OUString::createFromAscii(" "));
+    s1 += OUString(RTL_CONSTASCII_USTRINGPARAM(" -3223372036854775807"));
+    b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
     b2.append(m);
     TEST_ENSURE( s1 == b2.getStr(), "test_OWStringBuffer error 6");
 #endif
@@ -206,34 +206,34 @@ void oldtests::test_OUStringBuffer()
     b2.ensureCapacity(50);
     TEST_ENSURE( b2.getCapacity() == 50, "test_OWStringBuffer error 8");
 
-    b2.append(OUString::createFromAscii("Hier fuege ich jetzt ein > <\n"));
-    b2.insert(26, OUString::createFromAscii(" Hallo"));
-    s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > Hallo <\n");
+    b2.append(OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > <\n")));
+    b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" Hallo")));
+    s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 9");
 
     b2.insert(26, b);
-    b2.insert(26, OUString::createFromAscii(" "));
-    s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > false Hallo <\n");
+    b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
+    s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > false Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 10");
 
     b2.insert(26, n);
-    b2.insert(26, OUString::createFromAscii(" "));
-    s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > 123456789 false Hallo <\n");
+    b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
+    s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > 123456789 false Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 11");
 
 #ifndef SAL_OS2
     b2.insert(26, m);
-    b2.insert(26, OUString::createFromAscii(" "));
-    s2 = OUString::createFromAscii("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n");
+    b2.insert(26, OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
+    s2 = OUString(RTL_CONSTASCII_USTRINGPARAM("Hier fuege ich jetzt ein > -3223372036854775807 123456789 false Hallo <\n"));
     TEST_ENSURE( s2 == b2.getStr(), "test_OWStringBuffer error 12");
 #endif
 
     // ASCII-Schnittstelle, AB 15.10.1999
-    OUString s3(OUString::createFromAscii("Noch'n RTL OUString"));
+    OUString s3(OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString")));
     OUStringBuffer b3(s3);
     sal_Char aAsciiStr[] = " mit appendetem ASCII\n";
     b3.appendAscii( aAsciiStr );
-    s3 = OUString::createFromAscii("Noch'n RTL OUString mit appendetem ASCII\n");
+    s3 = OUString(RTL_CONSTASCII_USTRINGPARAM("Noch'n RTL OUString mit appendetem ASCII\n"));
     TEST_ENSURE( b3.getStr() == s3 , "test_OWStringBuffer error 13");
 
 
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions.cxx b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
index be58ac4effa6..6341fe35a980 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions.cxx
@@ -216,7 +216,7 @@ namespace testOfHelperFunctions
         rtl::OString sValue("foo bar");
         t_print("a String '%s' (should be 'foo bar')\n", sValue.getStr());
 
-        rtl::OUString suValue(rtl::OUString::createFromAscii("a unicode string"));
+        rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("a unicode string"));
         sValue <<= suValue;
         t_print("a String '%s'\n", sValue.getStr());
     }
diff --git a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
index 465b05229555..52ec09121c6d 100644
--- a/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
+++ b/sal/qa/testHelperFunctions/testHelperFunctions2.cxx
@@ -47,7 +47,7 @@ namespace testOfHelperFunctions
     void test_valueequal::valueequal_001( )
     {
         rtl::OString sValue;
-        rtl::OUString suValue(rtl::OUString::createFromAscii("This is only a test of some helper functions"));
+        rtl::OUString suValue(RTL_CONSTASCII_USTRINGPARAM("This is only a test of some helper functions"));
         sValue <<= suValue;
         t_print("'%s'\n", sValue.getStr());
     }
diff --git a/sal/workben/getlocaleinfotest.cxx b/sal/workben/getlocaleinfotest.cxx
index da2642ca147b..f8467e945a91 100644
--- a/sal/workben/getlocaleinfotest.cxx
+++ b/sal/workben/getlocaleinfotest.cxx
@@ -35,8 +35,8 @@
 
 int _cdecl main( int argc, char * argv[] )
 {
-    rtl::OUString lang = rtl::OUString::createFromAscii( "de" );
-    rtl::OUString country = rtl::OUString::createFromAscii( "DE" );
+    rtl::OUString lang(RTL_CONSTASCII_USTRINGPARAM("de"));
+    rtl::OUString country(RTL_CONSTASCII_USTRINGPARAM("DE"));
     rtl_TextEncoding rtlTextEnc;
 
     rtl_Locale* rtlLocale =
diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx
index bff7d6dea096..f99b06c0727f 100644
--- a/sal/workben/measure_oustrings.cxx
+++ b/sal/workben/measure_oustrings.cxx
@@ -53,7 +53,7 @@ SAL_IMPLEMENT_MAIN()
     //get my cpu fan up to speed :-)
     for (int i = 0; i < 10000000; ++i)
     {
-        rtl::OUString sFoo(rtl::OUString::createFromAscii("X"));
+        rtl::OUString sFoo(RTL_CONSTASCII_USTRINGPARAM("X"));
         rtl::OUString sBar(RTL_CONSTASCII_USTRINGPARAM("X"));
 #ifdef SAL_DECLARE_UTF16
         rtl::OUString sBoo(RTL_CONSTASCII_USTRINGPARAM_WIDE("X"));
@@ -75,7 +75,7 @@ SAL_IMPLEMENT_MAIN()
     {
     sal_uInt32 nStartTime = osl_getGlobalTimer();
     for (int i = 0; i < 100000000; ++i)
-        rtl::OUString sFoo(rtl::OUString::createFromAscii(""));
+        rtl::OUString sFoo(OUString());
     sal_uInt32 nEndTime = osl_getGlobalTimer();
     std::cout << "rtl::OUString::createFromAscii() " << nEndTime - nStartTime << "ms" << std::endl;
     }
@@ -85,7 +85,7 @@ SAL_IMPLEMENT_MAIN()
     {
     sal_uInt32 nStartTime = osl_getGlobalTimer();
     for (int i = 0; i < 100000000; ++i)
-        rtl::OUString sFoo(rtl::OUString::createFromAscii("X"));
+        rtl::OUString sFoo(RTL_CONSTASCII_USTRINGPARAM("X"));
     sal_uInt32 nEndTime = osl_getGlobalTimer();
     std::cout << "rtl::OUString::createFromAscii(\"X\") " << nEndTime - nStartTime << "ms" << std::endl;
     }
@@ -120,7 +120,7 @@ SAL_IMPLEMENT_MAIN()
     {
     sal_uInt32 nStartTime = osl_getGlobalTimer();
     for (int i = 0; i < 100000000; ++i)
-        rtl::OUString sFoo(rtl::OUString::createFromAscii("XXXXXXXXXXXXXXX"));
+        rtl::OUString sFoo(RTL_CONSTASCII_USTRINGPARAM("XXXXXXXXXXXXXXX"));
     sal_uInt32 nEndTime = osl_getGlobalTimer();
     std::cout << "rtl::OUString::createFromAscii(\"XXXXXXXX\") " << nEndTime - nStartTime << "ms" << std::endl;
     }
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index d92522fa07ca..4881248eb212 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -163,7 +163,7 @@ sal_Bool Initialize( void )
         iniFileURL=rtl::OUString( rtl_uString_getStr(strExeFileURL) ,(int) (pExeFileCount-rtl_uString_getStr(strExeFileURL)) );
 
         // add "/testfile.ini" to iniFileURL
-        iniFileURL+=rtl::OUString::createFromAscii("/testfile.ini");
+        iniFileURL+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/testfile.ini"));
 
         // Open the ini-File
         pFile=new File( iniFileURL );
@@ -906,7 +906,7 @@ void FileCopyAndMoveTest( void )
     // FileCopyTest
     //--------------------------------------------------
 
-    destPath+=rtl::OUString::createFromAscii("/");
+    destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     destPath+=file3;
 
     printf( "Copy the file ");
@@ -940,7 +940,7 @@ void FileCopyAndMoveTest( void )
     //--------------------------------------------------
 
     destPath=rtl::OUString( dir_not_exist );
-    destPath+=rtl::OUString::createFromAscii("/");
+    destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     destPath+=file3;
 
     printf( "Copy a file to a not existing directory \n");
@@ -973,7 +973,7 @@ void FileCopyAndMoveTest( void )
     //--------------------------------------------------
 
     destPath=rtl::OUString( dir2 );
-    destPath+=rtl::OUString::createFromAscii("/");
+    destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     destPath+=file3;
 
     printf( "Move the file ");
@@ -1022,7 +1022,7 @@ void FileCopyAndMoveTest( void )
     //--------------------------------------------------
 
     destPath=rtl::OUString( dir_not_exist );
-    destPath+=rtl::OUString::createFromAscii("/");
+    destPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     destPath+=file3;
 
     printf( "Move a file to a not existing directory: \n");
@@ -2302,15 +2302,15 @@ void AbsolutePathTest(void)
     printf( "AbsolutePath-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
-    DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("."));
-    DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii(".."));
-    DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("../.."));
-    DoAbsolutePathTest(dir1, rtl::OUString::createFromAscii("../HUHU"));
+    DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")));
+    DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")));
+    DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../..")));
+    DoAbsolutePathTest(dir1, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU")));
 
-    DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("."));
-    DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii(".."));
-    DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("../.."));
-    DoAbsolutePathTest(dir_on_server, rtl::OUString::createFromAscii("../HUHU"));
+    DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")));
+    DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..")));
+    DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../..")));
+    DoAbsolutePathTest(dir_on_server, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("../HUHU")));
 
     PressKey();
     return;
@@ -2420,7 +2420,7 @@ void SearchPathTest(void)
     printFileName( file3 );
     printf( "\n" );
 
-    rc=FileBase::searchFileURL( file3 , rtl::OUString::createFromAscii("") , strResultPath );
+    rc=FileBase::searchFileURL( file3 , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) , strResultPath );
 
     if ( rc == FileBase::E_None )
     {
@@ -2457,7 +2457,7 @@ void SearchPathTest(void)
     //------------------------------------------------------------
 
     rtl::OUString       strSearchPath( dir_not_exist );
-    strSearchPath+=rtl::OUString::createFromAscii(";");
+    strSearchPath+=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
     strSearchPath+=dir_on_server;
 
     printf( "\nsearchFileURL:  File : ");
author	Gert Faller <gertfaller@aliceadsl.fr>	2010-12-10 18:31:39 +0100
committer	Gert Faller <gertfaller@aliceadsl.fr>	2010-12-10 18:31:39 +0100
commit	3a18c3d97abfb60a09cc6a8bd5dd163fe2cfafa3 (patch)
tree	02ef980b5d6440ebbacf6f8801bea9d27f62b7a5 /sal
parent	377a56fb1b9825ec5dc71ba9ae81b6e27cfabffb (diff)