TL_CONSTASCII_USTRINGPARAM in libs core 16

16 files changed, 67 insertions, 67 deletions

diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index e19e231a7773..7cecb89aae0f 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -76,8 +76,8 @@ GConfClient* getGconfClient()
         mClient = gconf_client_get_default();
         if (!mClient)
         {
-            throw uno::RuntimeException(rtl::OUString::createFromAscii
-                ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection"),NULL);
+            throw uno::RuntimeException(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
+                ("GconfBackend:GconfLayer: Cannot Initialize Gconf connection")),NULL);
         }
 
         static const char * const PreloadValuesList[] =
@@ -117,7 +117,7 @@ static OUString xdg_user_dir_lookup (const char *type)
 
     if (!aSecurity.getHomeDir( aHomeDirURL ) )
     {
-    osl::FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii("/tmp"), aDocumentsDirURL);
+    osl::FileBase::getFileURLFromSystemPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/tmp")), aDocumentsDirURL);
     return aDocumentsDirURL;
     }
 
@@ -125,12 +125,12 @@ static OUString xdg_user_dir_lookup (const char *type)
     if (config_home == NULL || config_home[0] == 0)
     {
     aConfigFileURL = OUString(aHomeDirURL);
-    aConfigFileURL += OUString::createFromAscii( "/.config/user-dirs.dirs" );
+    aConfigFileURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/.config/user-dirs.dirs"));
     }
     else
     {
     aConfigFileURL = OUString::createFromAscii(config_home);
-    aConfigFileURL += OUString::createFromAscii( "/user-dirs.dirs" );
+    aConfigFileURL += OUString(RTL_CONSTASCII_USTRINGPARAM("/user-dirs.dirs"));
     }
 
     if(osl_File_E_None == osl_openFile(aConfigFileURL.pData, &handle, osl_File_OpenFlag_Read))
@@ -281,9 +281,9 @@ uno::Any translateToOOo( const ConfigurationValue aValue, GConfValue *aGconfValu
             uno::Any aOriginalValue = makeAnyOfGconfValue( aGconfValue );
             aOriginalValue >>= aProxyMode;
 
-            if( aProxyMode.equals( rtl::OUString::createFromAscii( "manual" ) ) )
+            if( aProxyMode.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("manual")) ) )
                 return uno::makeAny( (sal_Int32) 1 );
-            else if( aProxyMode.equals( rtl::OUString::createFromAscii( "none" ) ) )
+            else if( aProxyMode.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("none")) ) )
                 return uno::makeAny( (sal_Int32) 0 );
         }
             break;
@@ -442,7 +442,7 @@ sal_Bool SAL_CALL isDependencySatisfied( GConfClient* aClient, const Configurati
                 g_get_real_name(), osl_getThreadTextEncoding() ) );
             if( !aCompleteName.equalsAscii( "Unknown" ) )
             {
-                if( aCompleteName.trim().indexOf(rtl::OUString::createFromAscii(" "), 0) != -1 )
+                if( aCompleteName.trim().indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")), 0) != -1 )
                     return sal_True;
             }
         }
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 808aab8d1440..ba8e4ff66ac9 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -321,7 +321,7 @@ css::uno::Any LocaleBackend::getPropertyValue(
 //------------------------------------------------------------------------------
 
 rtl::OUString SAL_CALL LocaleBackend::getBackendName(void) {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.LocaleBackend") ;
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LocaleBackend")) ;
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/backends/macbe/macbackend.cxx b/shell/source/backends/macbe/macbackend.cxx
index 5814806be1ff..fee3e696a04c 100644
--- a/shell/source/backends/macbe/macbackend.cxx
+++ b/shell/source/backends/macbe/macbackend.cxx
@@ -428,7 +428,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
                 CFStringRef rException = (CFStringRef) CFArrayGetValueAtIndex(rExceptionsList, idx);
 
                 if (idx>0)
-                    aProxyBypassList += rtl::OUString::createFromAscii( ";" );
+                    aProxyBypassList += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
 
                 aProxyBypassList += CFStringToOUString(rException);
             }
@@ -456,7 +456,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
 
 rtl::OUString SAL_CALL MacOSXBackend::getBackendName(void)
 {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.MacOSXBackend");
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.MacOSXBackend"));
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 4601e71a6b0b..fe9a37459157 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -360,7 +360,7 @@ css::uno::Any WinInetBackend::getPropertyValue(
 //------------------------------------------------------------------------------
 
 rtl::OUString SAL_CALL WinInetBackend::getBackendName(void) {
-    return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.WinInetBackend") ;
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.WinInetBackend")) ;
 }
 
 //------------------------------------------------------------------------------
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx b/shell/source/cmdmail/cmdmailmsg.cxx
index c51e2f469042..6b0a37d31c21 100644
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -213,7 +213,7 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
     else if( 0 == aName.compareToAscii( "attachment" ) &&  m_Attachments.getLength() )
         return makeAny( m_Attachments );
 
-   throw NoSuchElementException( OUString::createFromAscii( "key not found: ") + aName,
+   throw NoSuchElementException( OUString(RTL_CONSTASCII_USTRINGPARAM("key not found: ")) + aName,
         static_cast < XNameAccess * > (this) );
 }
 
@@ -230,22 +230,22 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames(  )
     Sequence< OUString > aRet( 6 );
 
     if( m_aOriginator.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "from" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("from"));
 
     if( m_aRecipient.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "to" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("to"));
 
     if( m_CcRecipients.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "cc" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("cc"));
 
     if( m_BccRecipients.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "bcc" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("bcc"));
 
     if( m_aSubject.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "subject" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("subject"));
 
     if( m_Attachments.getLength() )
-        aRet[nItems++] = OUString::createFromAscii( "attachment" );
+        aRet[nItems++] = OUString(RTL_CONSTASCII_USTRINGPARAM("attachment"));
 
     aRet.realloc( nItems );
     return aRet;
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index ce6ff20c119b..7b1b1c1b2b8b 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -88,7 +88,7 @@ namespace // private
     Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.system.SimpleCommandMail");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SimpleCommandMail"));
         return aRet;
     }
 
@@ -106,7 +106,7 @@ CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
     if ( xServiceManager.is() ) {
         m_xConfigurationProvider = Reference< XMultiServiceFactory > (
             xServiceManager->createInstanceWithContext(
-                OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ), xContext ),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")), xContext ),
             UNO_QUERY );
     }
 }
@@ -178,7 +178,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
             RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/ExternalMailer" ) );
 
         PropertyValue aProperty;
-        aProperty.Name = OUString::createFromAscii( "nodepath" );
+        aProperty.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath"));
         aProperty.Value = makeAny( aConfigRoot );
 
         Sequence< Any > aArgumentList( 1 );
@@ -187,7 +187,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
         Reference< XNameAccess > xNameAccess =
             Reference< XNameAccess > (
                 m_xConfigurationProvider->createInstanceWithArguments(
-                    OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")),
                     aArgumentList ),
                 UNO_QUERY );
 
@@ -197,7 +197,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
 
             // Retrieve the value for "Program" node and append it feed senddoc with it
             // using the (undocumented) --mailclient switch
-            xNameAccess->getByName( OUString::createFromAscii( "Program" ) ) >>= aMailer;
+            xNameAccess->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("Program")) ) >>= aMailer;
 
             if( aMailer.getLength() )
             {
@@ -298,7 +298,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
 OUString SAL_CALL CmdMailSuppl::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( COMP_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 1d52eab31618..8d9152ae0c40 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -81,7 +81,7 @@ namespace // private
     Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SystemShellExecute");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SystemShellExecute"));
         return aRet;
     }
 }
@@ -299,7 +299,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
 OUString SAL_CALL ShellExec::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( SHELLEXEC_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( SHELLEXEC_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 6e20aaa23f92..3f6f7b4d398a 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -44,8 +44,8 @@
 
 #include <unistd.h>
 
-const rtl::OUString RECENTLY_USED_FILE_NAME = rtl::OUString::createFromAscii(".recently-used");
-const rtl::OUString SLASH = rtl::OUString::createFromAscii("/");
+const rtl::OUString RECENTLY_USED_FILE_NAME(RTL_CONSTASCII_USTRINGPARAM(".recently-used"));
+const rtl::OUString SLASH(RTL_CONSTASCII_USTRINGPARAM("/"));
 
 namespace /* private */ {
 
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index bf430b2e6497..46ca21240d57 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -84,7 +84,7 @@ namespace // private
     Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SystemShellExecute");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SystemShellExecute"));
         return aRet;
     }
 
@@ -202,8 +202,8 @@ namespace // private
     // trying to identify a jump mark
     //-----------------------------------------
 
-    const OUString    JUMP_MARK_HTM  = OUString::createFromAscii(".htm#");
-    const OUString    JUMP_MARK_HTML = OUString::createFromAscii(".html#");
+    const OUString    JUMP_MARK_HTM(RTL_CONSTASCII_USTRINGPARAM(".htm#"));
+    const OUString    JUMP_MARK_HTML(RTL_CONSTASCII_USTRINGPARAM(".html#"));
     const sal_Unicode HASH_MARK      = (sal_Unicode)'#';
 
     bool has_jump_mark(const OUString& system_path, sal_Int32* jmp_mark_start = NULL)
@@ -288,13 +288,13 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
     // parameter checking
     if (0 == aCommand.getLength())
         throw IllegalArgumentException(
-            OUString::createFromAscii( "Empty command" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Empty command")),
             static_cast< XSystemShellExecute* >( this ),
             1 );
 
     if (!(nFlags >= DEFAULTS && nFlags <= NO_SYSTEM_ERROR_MESSAGE))
         throw IllegalArgumentException(
-            OUString::createFromAscii( "Invalid Flags specified" ),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid Flags specified")),
             static_cast< XSystemShellExecute* >( this ),
             3 );
 
@@ -344,7 +344,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
             psxErr = MapError(psxErr);
 
         throw SystemShellExecuteException(
-            OUString::createFromAscii("Error executing command"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Error executing command")),
             static_cast< XSystemShellExecute* >(this),
             psxErr);
     }
@@ -357,7 +357,7 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
 OUString SAL_CALL CSysShExec::getImplementationName(  )
     throw( RuntimeException )
 {
-    return OUString::createFromAscii( SYSSHEXEC_IMPL_NAME );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_IMPL_NAME ));
 }
 
 // -------------------------------------------------
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index c96a1ea7dfdb..848201c604f2 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -100,7 +100,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
             pXNewKey->createKey(
-                OUString::createFromAscii( SYSSHEXEC_REGKEY_NAME ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_REGKEY_NAME )) );
         }
         catch( InvalidRegistryException& )
         {
@@ -124,7 +124,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, SYSSHEXEC_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString::createFromAscii( SYSSHEXEC_SERVICE_NAME );
+        aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SYSSHEXEC_SERVICE_NAME ));
 
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index 6ca98590ddee..e47a767c0aeb 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -63,15 +63,15 @@ using css::system::SimpleMailClientFlags::NO_LOGON_DIALOG;
 typedef std::vector<rtl::OUString> StringList_t;
 typedef StringList_t::const_iterator StringListIterator_t;
 
-const rtl::OUString TO = rtl::OUString::createFromAscii("--to");
-const rtl::OUString CC = rtl::OUString::createFromAscii("--cc");
-const rtl::OUString BCC = rtl::OUString::createFromAscii("--bcc");
-const rtl::OUString FROM = rtl::OUString::createFromAscii("--from");
-const rtl::OUString SUBJECT = rtl::OUString::createFromAscii("--subject");
-const rtl::OUString BODY = rtl::OUString::createFromAscii("--body");
-const rtl::OUString ATTACH = rtl::OUString::createFromAscii("--attach");
-const rtl::OUString FLAG_MAPI_DIALOG = rtl::OUString::createFromAscii("--mapi-dialog");
-const rtl::OUString FLAG_MAPI_LOGON_UI = rtl::OUString::createFromAscii("--mapi-logon-ui");
+const rtl::OUString TO(RTL_CONSTASCII_USTRINGPARAM("--to"));
+const rtl::OUString CC(RTL_CONSTASCII_USTRINGPARAM("--cc"));
+const rtl::OUString BCC(RTL_CONSTASCII_USTRINGPARAM("--bcc"));
+const rtl::OUString FROM(RTL_CONSTASCII_USTRINGPARAM("--from"));
+const rtl::OUString SUBJECT(RTL_CONSTASCII_USTRINGPARAM("--subject"));
+const rtl::OUString BODY(RTL_CONSTASCII_USTRINGPARAM("--body"));
+const rtl::OUString ATTACH(RTL_CONSTASCII_USTRINGPARAM("--attach"));
+const rtl::OUString FLAG_MAPI_DIALOG(RTL_CONSTASCII_USTRINGPARAM("--mapi-dialog"));
+const rtl::OUString FLAG_MAPI_LOGON_UI(RTL_CONSTASCII_USTRINGPARAM("--mapi-logon-ui"));
 
 namespace /* private */
 {
@@ -232,7 +232,7 @@ void CSmplMailClient::assembleCommandLine(
         osl::FileBase::RC err = osl::FileBase::getSystemPathFromFileURL(attachments[i], sysPath);
         if (err != osl::FileBase::E_None)
             throw IllegalArgumentException(
-                rtl::OUString::createFromAscii("Invalid attachment file URL"),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid attachment file URL")),
                 static_cast<XSimpleMailClient*>(this),
                 1);
 
@@ -258,7 +258,7 @@ void SAL_CALL CSmplMailClient::sendSimpleMailMessage(
 
     if (!executeSenddoc(senddocParams))
         throw Exception(
-            rtl::OUString::createFromAscii("Send email failed"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Send email failed")),
             static_cast<XSimpleMailClient*>(this));
 }
 
@@ -267,7 +267,7 @@ void CSmplMailClient::validateParameter(
 {
     if (!xSimpleMailMessage.is())
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("Empty mail message reference"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Empty mail message reference")),
             static_cast<XSimpleMailClient*>(this),
             1);
 
@@ -277,14 +277,14 @@ void CSmplMailClient::validateParameter(
     // check the flags, the allowed range is 0 - (2^n - 1)
     if (aFlag < 0 || aFlag > 3)
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("Invalid flag value"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid flag value")),
             static_cast<XSimpleMailClient*>(this),
             2);
 
     // check if a recipient is specified of the flags NO_USER_INTERFACE is specified
     if ((aFlag & NO_USER_INTERFACE) && !xSimpleMailMessage->getRecipient().getLength())
         throw IllegalArgumentException(
-            rtl::OUString::createFromAscii("No recipient specified"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No recipient specified")),
             static_cast<XSimpleMailClient*>(this),
             1);
 }
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index 7ed4380b8116..2c6c571eb92f 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -100,7 +100,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr
         {
             Reference< XRegistryKey > pXNewKey( static_cast< XRegistryKey* >( pRegistryKey ) );
             pXNewKey->createKey(
-                OUString::createFromAscii( COMP_REGKEY_NAME ) );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_REGKEY_NAME )) );
         }
         catch( InvalidRegistryException& )
         {
@@ -124,7 +124,7 @@ void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* p
     if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, COMP_IMPL_NAME ) ) )
     {
         Sequence< OUString > aSNS( 1 );
-        aSNS.getArray( )[0] = OUString::createFromAscii( COMP_SERVICE_NAME );
+        aSNS.getArray( )[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( COMP_SERVICE_NAME ));
 
         Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
             reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx b/shell/source/win32/simplemail/smplmailsuppl.cxx
index 0839717b4726..9202df97efb8 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -50,7 +50,7 @@ namespace // private
     Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.sys.shell.SimpleSystemMail");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sys.shell.SimpleSystemMail"));
         return aRet;
     }
 
@@ -85,7 +85,7 @@ Reference<XSimpleMailClient> SAL_CALL CSmplMailSuppl::querySimpleMailClient()
 OUString SAL_CALL CSmplMailSuppl::getImplementationName()
     throw(RuntimeException)
 {
-    return OUString::createFromAscii(COMP_IMPL_NAME);
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(COMP_IMPL_NAME));
 }
 
 sal_Bool SAL_CALL CSmplMailSuppl::supportsService(const OUString& ServiceName)
diff --git a/shell/source/win32/workbench/TestProxySet.cxx b/shell/source/win32/workbench/TestProxySet.cxx
index 3e69f78fd86d..843a80cf61b2 100644
--- a/shell/source/win32/workbench/TestProxySet.cxx
+++ b/shell/source/win32/workbench/TestProxySet.cxx
@@ -114,7 +114,7 @@ int SAL_CALL main(int, char*, char* )
     try
     {
         Reference< XProxySettings > xProxySettings(
-            g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SystemProxySettings" ) ), UNO_QUERY );
+            g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemProxySettings")) ), UNO_QUERY );
 
         if ( !xProxySettings.is() )
         {
@@ -141,7 +141,7 @@ int SAL_CALL main(int, char*, char* )
         printf( "Test of SystemProxySettings successful\n" );
 
         xProxySettings = Reference< XProxySettings >(
-            g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SOProxySettings" ) ), UNO_QUERY );
+            g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SOProxySettings")) ), UNO_QUERY );
 
         if ( !xProxySettings.is() )
         {
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 9e0dcd4bc4f9..49e2701fa1ff 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -109,7 +109,7 @@ int SAL_CALL main(int , char*, char* )
     try
     {
         Reference< XSimpleMailClientSupplier > xSmplMailClientSuppl(
-            g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SimpleSystemMail" ) ), UNO_QUERY );
+            g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SimpleSystemMail")) ), UNO_QUERY );
 
         if ( !xSmplMailClientSuppl.is() )
         {
@@ -127,30 +127,30 @@ int SAL_CALL main(int , char*, char* )
 
             if ( xSmplMailMsg.is( ) )
             {
-                xSmplMailMsg->setRecipient( OUString::createFromAscii("tino.rachui@germany.sun.com") );
-                xSmplMailMsg->setOriginator( OUString::createFromAscii( "tino.rachui@germany.sun.com" ) );
+                xSmplMailMsg->setRecipient( OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com")) );
+                xSmplMailMsg->setOriginator( OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com")) );
 
                 Sequence< OUString > ccRecips( 1 );
-                ccRecips[0] = OUString::createFromAscii( "tino.rachui@germany.sun.com" );
+                ccRecips[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com"));
 
                 xSmplMailMsg->setCcRecipient( ccRecips );
 
                 Sequence< OUString > bccRecips( 1 );
-                bccRecips[0] = OUString::createFromAscii( "tino.rachui@germany.sun.com" );
+                bccRecips[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("tino.rachui@germany.sun.com"));
 
                 xSmplMailMsg->setBccRecipient( bccRecips );
 
-                xSmplMailMsg->setSubject( OUString::createFromAscii( "Mapi Test" ) );
+                xSmplMailMsg->setSubject( OUString(RTL_CONSTASCII_USTRINGPARAM("Mapi Test")) );
 
                 Sequence< OUString > attachements( 2 );
 
-                OUString aFile = OUString::createFromAscii( "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testprx.exe" );
+                OUString aFile(RTL_CONSTASCII_USTRINGPARAM("D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testprx.exe"));
                 OUString aFileURL;
 
                 osl::FileBase::getFileURLFromSystemPath( aFile, aFileURL );
                 attachements[0] = aFileURL;
 
-                aFile = OUString::createFromAscii( "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testsyssh.exe" );
+                aFile = OUString(RTL_CONSTASCII_USTRINGPARAM("D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\testsyssh.exe"));
                 osl::FileBase::getFileURLFromSystemPath( aFile, aFileURL );
 
                 attachements[1] = aFile;
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index c3c7b5d2d435..4151f95df86a 100644
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -117,7 +117,7 @@ int SAL_CALL main(int nArgc, char* Argv[], char*    )
     //-------------------------------------------------
 
     Reference< XSystemShellExecute > xSysShExec(
-        g_xFactory->createInstance( OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" ) ), UNO_QUERY );
+        g_xFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute")) ), UNO_QUERY );
 
     if ( !xSysShExec.is() )
     {