use RTL_CONSTASCII_USTRINGPARAM

19 files changed, 93 insertions, 105 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e34720d43d39..0b85d03dc70f 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1827,8 +1827,8 @@ void Desktop::Main()
     catch ( ... )
     {
         FatalError( MakeStartupErrorMessage(
-            OUString::createFromAscii(
-            "Unknown error during startup (Office wrapper service).\nInstallation could be damaged.")));
+            OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "Unknown error during startup (Office wrapper service).\nInstallation could be damaged."))));
         return;
     }
     */
@@ -1879,8 +1879,8 @@ void Desktop::Main()
         catch ( ... )
         {
             FatalError( MakeStartupErrorMessage(
-                OUString::createFromAscii(
-                "Unknown error during startup (TD/Desktop service).\nInstallation could be damaged.")));
+                OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "Unknown error during startup (TD/Desktop service).\nInstallation could be damaged."))));
             return;
         }
         */
@@ -2693,9 +2693,9 @@ void Desktop::OpenClients()
      /*
         ::comphelper::ConfigurationHelper::writeDirectKey(
                 ::comphelper::getProcessServiceFactory(),
-                ::rtl::OUString::createFromAscii("org.openoffice.Office.Recovery"),
-                ::rtl::OUString::createFromAscii("AutoSave"),
-                ::rtl::OUString::createFromAscii("Enabled"),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Recovery")),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoSave")),
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
                 ::com::sun::star::uno::makeAny(sal_False),
                 ::comphelper::ConfigurationHelper::E_STANDARD);
 
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 321110a64343..53ae517adc3a 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -81,11 +81,11 @@ OUString Desktop::GetLicensePath()
     aLangString = aLocale.Language;
     if ( aLocale.Country.getLength() != 0 )
     {
-        aLangString += OUString::createFromAscii("-");
+        aLangString += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
         aLangString += aLocale.Country;
         if ( aLocale.Variant.getLength() != 0 )
         {
-            aLangString += OUString::createFromAscii("-");
+            aLangString += OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
             aLangString += aLocale.Variant;
         }
     }
@@ -93,14 +93,14 @@ OUString Desktop::GetLicensePath()
     aLicensePath =
         aBaseInstallPath + OUString::createFromAscii(szLicensePath)
         + OUString::createFromAscii(szWNTLicenseName)
-        + OUString::createFromAscii("_")
+        + OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
         + aLangString
         + OUString::createFromAscii(szWNTLicenseExt);
 #else
     aLicensePath =
         aBaseInstallPath + OUString::createFromAscii(szLicensePath)
         + OUString::createFromAscii(szUNXLicenseName)
-        + OUString::createFromAscii("_")
+        + OUString(RTL_CONSTASCII_USTRINGPARAM("_"))
         + aLangString
         + OUString::createFromAscii(szUNXLicenseExt);
 #endif
@@ -153,7 +153,7 @@ static sal_Bool impl_isFirstStart()
     try {
         Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
 
-        Any result = xPSet->getPropertyValue(OUString::createFromAscii("FirstStartWizardCompleted"));
+        Any result = xPSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FirstStartWizardCompleted")));
         sal_Bool bCompleted = sal_False;
         if ((result >>= bCompleted) && bCompleted)
             return sal_False;  // wizard was already completed
@@ -188,10 +188,10 @@ static sal_Bool impl_parseDateTime(const OUString& aString, DateTime& aDateTime)
     sal_Int32 nDateLength = 10;
     sal_Int32 nTimeLength = 8;
 
-    OUString aDateTimeSep = OUString::createFromAscii("T");
-    OUString aDateSep = OUString::createFromAscii("-");
-    OUString aTimeSep = OUString::createFromAscii(":");
-    OUString aUTCString = OUString::createFromAscii("Z");
+    OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T"));
+    OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-"));
+    OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":"));
+    OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z"));
 
     OUString aDateString = aDateTimeString.copy(0, nDateLength);
     OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength);
@@ -229,7 +229,7 @@ static sal_Bool impl_isLicenseAccepted()
     {
         Reference< XPropertySet > xPSet = impl_getConfigurationAccess( OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office" ) ) );
 
-        Any result = xPSet->getPropertyValue(OUString::createFromAscii("LicenseAcceptDate"));
+        Any result = xPSet->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LicenseAcceptDate")));
 
         OUString aAcceptDate;
         if (result >>= aAcceptDate)
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 82ae6571d953..09a13d938405 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -118,14 +118,13 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
 
     Sequence< Any > aArgs(6);
     aArgs[0]
-        <<= rtl::OUString::createFromAscii(bServer ?
-                                               UCB_CONFIGURATION_KEY1_SERVER :
-                                               UCB_CONFIGURATION_KEY1_LOCAL);
+        <<= bServer ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_SERVER)) :
+                      rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL));
     aArgs[1]
-        <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
-    aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
+        <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
+    aArgs[2] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE"));
     aArgs[3] <<= aPipe;
-    aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL");
+    aArgs[4] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL"));
     aArgs[5] <<= aPortal.makeStringAndClear();
 
     bool ret =
@@ -161,13 +160,13 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect)
                     {
                         Reference<XContentProvider> xCP(
                             xServiceFactory->createInstance(
-                                rtl::OUString::createFromAscii(
-                                    "com.sun.star.ucb.GnomeVFSContentProvider")),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                    "com.sun.star.ucb.GnomeVFSContentProvider"))),
                             UNO_QUERY);
                         if(xCP.is())
                             xCPM->registerContentProvider(
                                 xCP,
-                                rtl::OUString::createFromAscii(".*"),
+                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*")),
                                 false);
                     } catch (...)
                     {
@@ -278,7 +277,7 @@ void Desktop::RegisterServices( Reference< XMultiServiceFactory >& xSMgr )
         if ( !configureUcb( bServer, aPortalConnect ) )
         {
             DBG_ERROR( "Can't configure UCB" );
-            throw com::sun::star::uno::Exception(rtl::OUString::createFromAscii("RegisterServices, configureUcb"), NULL);
+            throw com::sun::star::uno::Exception(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RegisterServices, configureUcb")), NULL);
         }
 
         CreateTemporaryDirectory();
@@ -306,7 +305,7 @@ void Desktop::createAcceptor(const OUString& aAcceptString)
         aSeq[1] <<= bAccept;
         Reference<XInitialization> rAcceptor(
             ::comphelper::getProcessServiceFactory()->createInstance(
-            OUString::createFromAscii( "com.sun.star.office.Acceptor" )), UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.office.Acceptor" ))), UNO_QUERY );
         if ( rAcceptor.is() ) {
             try{
                 rAcceptor->initialize( aSeq );
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index b46508a9f3f5..20bad6f4504a 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -334,15 +334,15 @@ static void impl_setNeedsCompatCheck()
                 xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
 
         Sequence< Any > theArgs(1);
-        beans::NamedValue v( OUString::createFromAscii("NodePath"),
-                      makeAny( OUString::createFromAscii("org.openoffice.Setup/Office") ) );
+        beans::NamedValue v( OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")),
+                      makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) );
         theArgs[0] <<= v;
         Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >(
             theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW );
 
-        Any value = makeAny( OUString::createFromAscii("never") );
+        Any value = makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("never")) );
 
-        pset->setPropertyValue( OUString::createFromAscii("LastCompatibilityCheckID"), value );
+        pset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")), value );
         Reference< util::XChangesBatch >( pset, UNO_QUERY_THROW )->commitChanges();
     }
     catch (const Exception&) {}
@@ -387,20 +387,20 @@ static bool impl_needsCompatCheck()
                 xFactory->createInstance(sConfigSrvc), UNO_QUERY_THROW);
 
         Sequence< Any > theArgs(1);
-        beans::NamedValue v( OUString::createFromAscii("NodePath"),
-                      makeAny( OUString::createFromAscii("org.openoffice.Setup/Office") ) );
+        beans::NamedValue v( OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")),
+                      makeAny( OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup/Office")) ) );
         theArgs[0] <<= v;
         Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >(
             theConfigProvider->createInstanceWithArguments( sAccessSrvc, theArgs ), UNO_QUERY_THROW );
 
-        Any result = pset->getPropertyValue( OUString::createFromAscii("LastCompatibilityCheckID") );
+        Any result = pset->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")) );
 
         result >>= aLastCheckBuildID;
         if ( aLastCheckBuildID != aCurrentBuildID )
         {
             bNeedsCheck = true;
             result <<= aCurrentBuildID;
-            pset->setPropertyValue( OUString::createFromAscii("LastCompatibilityCheckID"), result );
+            pset->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LastCompatibilityCheckID")), result );
             Reference< util::XChangesBatch >( pset, UNO_QUERY_THROW )->commitChanges();
         }
 #ifdef DEBUG
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 71e749510375..bb9599bf71c4 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -138,8 +138,8 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
 
     Reference< XExternalUriReferenceTranslator > xTranslator(
         xMS->createInstance(
-        OUString::createFromAscii(
-        "com.sun.star.uri.ExternalUriReferenceTranslator")),
+        OUString(RTL_CONSTASCII_USTRINGPARAM(
+        "com.sun.star.uri.ExternalUriReferenceTranslator"))),
         UNO_QUERY);
 
     // parse command line arguments
@@ -168,7 +168,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
             break;
         }
         // convert file URLs to internal form #112849#
-        if (aArg.indexOf(OUString::createFromAscii("file:"))==0 &&
+        if (aArg.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file:")))==0 &&
             xTranslator.is())
         {
             OUString tmp(xTranslator->translateToInternal(aArg));
@@ -982,8 +982,6 @@ sal_Bool CommandLineArgs::GetConversionOut( ::rtl::OUString& rPara ) const
     return m_aStrSetParams[ CMD_STRINGPARAM_CONVERSIONOUT ];
 }
 
-
-
 sal_Bool CommandLineArgs::IsEmpty() const
 {
     osl::MutexGuard  aMutexGuard( m_aMutex );
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 065a665e2427..113732b5245d 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -979,13 +979,13 @@ static void AddConversionsToDispatchList(
 
     if( rParamOut.trim().getLength() )
     {
-        aParam += ::rtl::OUString::createFromAscii(";");
+        aParam += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";"));
         aParam += aOutDir;
     }
     else
     {
         ::osl::FileBase::getSystemPathFromFileURL( aPWD, aPWD );
-        aParam += ::rtl::OUString::createFromAscii( ";" ) + aPWD;
+        aParam += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ";" )) + aPWD;
     }
 
     if ( rRequestList.getLength() > 0 )
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index f1afda0590d7..263c09e16a54 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -109,8 +109,8 @@ namespace desktop {
 
             Sequence< Any > theArgs(1);
             NamedValue v;
-            v.Name = OUString::createFromAscii("NodePath");
-            v.Value = makeAny(OUString::createFromAscii("org.openoffice.Setup"));
+            v.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath"));
+            v.Value = makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")));
             theArgs[0] <<= v;
             Reference< XHierarchicalNameAccess> hnacc(
                 theConfigProvider->createInstanceWithArguments(
@@ -202,7 +202,7 @@ namespace desktop {
                     rtl::OUString itemname = aFileStatus.getFileName();
                     // append trailing '/' if needed
                     if (newDstUnqPath.lastIndexOf(sal_Unicode('/')) != newDstUnqPath.getLength()-1)
-                        newDstUnqPath += rtl::OUString::createFromAscii("/");
+                        newDstUnqPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
                     newDstUnqPath += itemname;
                     // recursion
                     err = copy_recursive(newSrcUnqPath, newDstUnqPath);
@@ -261,21 +261,21 @@ namespace desktop {
         }
         try
         {
-            OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
-            OUString sAccessSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess");
+            OUString sConfigSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"));
+            OUString sAccessSrvc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
 
             // get configuration provider
             Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory();
             Reference< XMultiServiceFactory > theConfigProvider = Reference< XMultiServiceFactory >(
                 theMSF->createInstance(sConfigSrvc), UNO_QUERY_THROW);
             Sequence< Any > theArgs(1);
-            NamedValue v(OUString::createFromAscii("NodePath"), makeAny(OUString::createFromAscii("org.openoffice.Setup")));
-            //v.Name = OUString::createFromAscii("NodePath");
-            //v.Value = makeAny(OUString::createFromAscii("org.openoffice.Setup"));
+            NamedValue v(OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath")), makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup"))));
+            //v.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("NodePath"));
+            //v.Value = makeAny(OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Setup")));
             theArgs[0] <<= v;
             Reference< XHierarchicalPropertySet> hpset(
                 theConfigProvider->createInstanceWithArguments(sAccessSrvc, theArgs), UNO_QUERY_THROW);
-            hpset->setHierarchicalPropertyValue(OUString::createFromAscii("Office/ooSetupInstCompleted"), makeAny(sal_True));
+            hpset->setHierarchicalPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Office/ooSetupInstCompleted")), makeAny(sal_True));
             Reference< XChangesBatch >(hpset, UNO_QUERY_THROW)->commitChanges();
         }
         catch ( PropertyVetoException& )
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 38aa08674baf..9e6d6dfe725a 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -261,7 +261,6 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
     return pBackend;
 }
 
-
 bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
 {
     bool bCompiled = true;
@@ -362,12 +361,10 @@ beans::Optional< OUString > BackendImpl::PackageImpl::getRegistrationDataURL()
     return beans::Optional<OUString>(true, OUString());
 }
 
-
 //##############################################################################
 
-static rtl::OUString aSlash( rtl::OUString::createFromAscii( "/" ) );
-static rtl::OUString aHelpStr( rtl::OUString::createFromAscii( "help" ) );
-
+static rtl::OUString aSlash(RTL_CONSTASCII_USTRINGPARAM("/"));
+static rtl::OUString aHelpStr(RTL_CONSTASCII_USTRINGPARAM("help"));
 
 void BackendImpl::implProcessHelp
 ( Reference< deployment::XPackage > xPackage, bool doRegisterPackage, bool compiledHelp,
@@ -394,7 +391,7 @@ void BackendImpl::implProcessHelp
             if( !xSFA->isFolder( aExpandedHelpURL ) )
             {
                 rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR );
-                aErrStr += rtl::OUString::createFromAscii( "No help folder" );
+                aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "No help folder" ));
                 OWeakObject* oWeakThis = static_cast<OWeakObject *>(this);
                 throw deployment::DeploymentException( rtl::OUString(), oWeakThis,
                                                        makeAny( uno::Exception( aErrStr, oWeakThis ) ) );
@@ -407,8 +404,8 @@ void BackendImpl::implProcessHelp
                 try
                 {
                     xInvocation = Reference< script::XInvocation >(
-                        xContext->getServiceManager()->createInstanceWithContext( rtl::OUString::createFromAscii(
-                                                                                      "com.sun.star.help.HelpIndexer" ), xContext ) , UNO_QUERY );
+                        xContext->getServiceManager()->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                                                                      "com.sun.star.help.HelpIndexer" )), xContext ) , UNO_QUERY );
                 }
                 catch (Exception &)
                 {
@@ -451,9 +448,9 @@ void BackendImpl::implProcessHelp
                         aJarFile, rtl_UriCharClassPchar,
                         rtl_UriEncodeIgnoreEscapes,
                         RTL_TEXTENCODING_UTF8 );
-                    rtl::OUString aDestBasePath = rtl::OUString::createFromAscii( "vnd.sun.star.pkg://" );
+                    rtl::OUString aDestBasePath(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.pkg://" ));
                     aDestBasePath += aEncodedJarFilePath;
-                    aDestBasePath += rtl::OUString::createFromAscii( "/" );
+                    aDestBasePath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ));
 
                     sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1;
 
@@ -499,20 +496,20 @@ void BackendImpl::implProcessHelp
                     {
                         Sequence<uno::Any> aParamsSeq( 6 );
 
-                        aParamsSeq[0] = uno::makeAny( rtl::OUString::createFromAscii( "-lang" ) );
+                        aParamsSeq[0] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-lang" )) );
 
                         rtl::OUString aLang;
                         sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' );
                         if( nLastSlash != -1 )
                             aLang = aLangURL.copy( nLastSlash + 1 );
                         else
-                            aLang = rtl::OUString::createFromAscii( "en" );
+                            aLang = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "en" ));
                         aParamsSeq[1] = uno::makeAny( aLang );
 
-                        aParamsSeq[2] = uno::makeAny( rtl::OUString::createFromAscii( "-mod" ) );
-                        aParamsSeq[3] = uno::makeAny( rtl::OUString::createFromAscii( "help" ) );
+                        aParamsSeq[2] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-mod" )) );
+                        aParamsSeq[3] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "help" )) );
 
-                        aParamsSeq[4] = uno::makeAny( rtl::OUString::createFromAscii( "-zipdir" ) );
+                        aParamsSeq[4] = uno::makeAny( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "-zipdir" )) );
                         rtl::OUString aSystemPath;
                         osl::FileBase::getSystemPathFromFileURL(
                             langFolderDestExpanded, aSystemPath );
@@ -520,7 +517,7 @@ void BackendImpl::implProcessHelp
 
                         Sequence< sal_Int16 > aOutParamIndex;
                         Sequence< uno::Any > aOutParam;
-                        uno::Any aRet = xInvocation->invoke( rtl::OUString::createFromAscii( "createIndex" ),
+                        uno::Any aRet = xInvocation->invoke( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "createIndex" )),
                                                              aParamsSeq, aOutParamIndex, aOutParam );
                     }
 
@@ -560,14 +557,14 @@ void BackendImpl::implProcessHelp
                             aErrStr += aErrMsg;
                             if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && aErrorInfo.m_aXMLParsingFile.getLength() )
                             {
-                                aErrStr += rtl::OUString::createFromAscii( " in " );
+                                aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " in " ));
 
                                 rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile,
                                                                                rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
                                 aErrStr += aDecodedFile;
                                 if( aErrorInfo.m_nXMLParsingLine != -1 )
                                 {
-                                    aErrStr += rtl::OUString::createFromAscii( ", line " );
+                                    aErrStr += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ", line " ));
                                     aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine );
                                 }
                             }
@@ -590,7 +587,6 @@ void BackendImpl::implProcessHelp
     }
 }
 
-
 void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir,
     std::vector< rtl::OUString >& o_rXhpFileVector )
 {
@@ -613,7 +609,7 @@ void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir,
             if( nLastDot != -1 )
             {
                 rtl::OUString aExt = aURL.copy( nLastDot + 1 );
-                if( aExt.equalsIgnoreAsciiCase( rtl::OUString::createFromAscii( "xhp" ) ) )
+                if( aExt.equalsIgnoreAsciiCase( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "xhp" )) ) )
                     o_rXhpFileVector.push_back( aURL );
             }
         }
@@ -629,15 +625,15 @@ Reference< ucb::XSimpleFileAccess > BackendImpl::getFileAccess( void )
         {
             m_xSFA = Reference< ucb::XSimpleFileAccess >(
                 xContext->getServiceManager()->createInstanceWithContext(
-                    rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ),
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )),
                     xContext ), UNO_QUERY );
         }
         if( !m_xSFA.is() )
         {
             throw RuntimeException(
-                ::rtl::OUString::createFromAscii(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "dp_registry::backend::help::BackendImpl::getFileAccess(), "
-                "could not instatiate SimpleFileAccess." ),
+                "could not instatiate SimpleFileAccess." )),
                 Reference< XInterface >() );
         }
     }
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 78c49dd065f2..73b0ce15cd23 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -347,7 +347,7 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames()
     throw (RuntimeException)
 {
     return comphelper::makeSequence(
-        OUString::createFromAscii(BACKEND_SERVICE_NAME) );
+        OUString(RTL_CONSTASCII_USTRINGPARAM(BACKEND_SERVICE_NAME)) );
 }
 
 // XPackageRegistry
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
index fe0f378160d9..11835ddfa957 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
@@ -99,9 +99,9 @@ ParcelDescDocHandler::startElement( const OUString& aName,
         aName + OUSTR("\n"));
     if ( !skipIndex )
     {
-        if ( aName.equals( OUString::createFromAscii( "parcel" ) ) )
+        if ( aName.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "parcel" )) ) )
         {
-            m_sLang = xAttribs->getValueByName( OUString::createFromAscii( "language" ) );
+            m_sLang = xAttribs->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM( "language" )) );
         }
         ++skipIndex;
     }
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 02b6452f33cb..63296dd12c1a 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -256,7 +256,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
         {
             if (subType.EqualsIgnoreCaseAscii("vnd.sun.star.framework-script"))
             {
-                OUString lang = OUString::createFromAscii("Script");
+                OUString lang = OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
                 OUString sParcelDescURL = makeURL(
                     url, OUSTR("parcel-descriptor.xml") );
 
diff --git a/desktop/source/migration/cfgfilter.cxx b/desktop/source/migration/cfgfilter.cxx
index 7ee970235acc..ca4e0b542cc7 100644
--- a/desktop/source/migration/cfgfilter.cxx
+++ b/desktop/source/migration/cfgfilter.cxx
@@ -64,7 +64,7 @@ void SAL_CALL CConfigFilter::initialize(const Sequence< Any >& seqArgs)
         }
     }
     if (m_aCurrentComponent.getLength() == 0)
-        m_aCurrentComponent = OUString::createFromAscii("unknown.component");
+        m_aCurrentComponent = OUString(RTL_CONSTASCII_USTRINGPARAM("unknown.component"));
 
     if (!m_xSourceLayer.is()) {
         throw Exception();
@@ -78,7 +78,7 @@ void CConfigFilter::pushElement(rtl::OUString aName, sal_Bool bUse)
     OUString aPath;
     if (!m_elementStack.empty()) {
         aPath = m_elementStack.top().path; // or use base path
-        aPath += OUString::createFromAscii("/");
+        aPath += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
     }
     aPath += aName;
 
@@ -103,7 +103,7 @@ sal_Bool CConfigFilter::checkElement(rtl::OUString aName)
     // get full pathname for element
     OUString aFullPath;
     if (!m_elementStack.empty())
-        aFullPath = m_elementStack.top().path + OUString::createFromAscii("/");
+        aFullPath = m_elementStack.top().path + OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     aFullPath += aName;
 
diff --git a/desktop/source/migration/services/autocorrmigration.cxx b/desktop/source/migration/services/autocorrmigration.cxx
index 3030b429d1e9..a54ed08548cc 100644
--- a/desktop/source/migration/services/autocorrmigration.cxx
+++ b/desktop/source/migration/services/autocorrmigration.cxx
@@ -175,7 +175,7 @@ namespace migration
                 ::rtl::OUString sLanguageType = sSourceLocalName.copy( nStart, nEnd - nStart );
                 ::rtl::OUString sIsoName = MsLangId::convertLanguageToIsoString( (LanguageType) sLanguageType.toInt32() );
                 ::rtl::OUString sTargetLocalName = sBaseName;
-                sTargetLocalName += ::rtl::OUString::createFromAscii( "_" );
+                sTargetLocalName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_" ));
                 sTargetLocalName += sIsoName;
                 sTargetLocalName += sSuffix;
                 ::rtl::OUString sTargetName = sTargetDir + sTargetLocalName;
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 01c445630290..a5b13a636bfc 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -69,10 +69,10 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory )
 {
     m_rSMgr = rFactory;
     m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance(
-        rtl::OUString::createFromAscii( "com.sun.star.connection.Acceptor" )),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.connection.Acceptor" ))),
         UNO_QUERY );
     m_rBridgeFactory = Reference < XBridgeFactory > (m_rSMgr->createInstance(
-        rtl::OUString::createFromAscii( "com.sun.star.bridge.BridgeFactory" )),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.bridge.BridgeFactory" ))),
         UNO_QUERY );
     // get component context
     m_rContext = getComponentContext(m_rSMgr);
@@ -174,7 +174,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments )
         // "<connectString>;<protocol>"
         sal_Int32 nIndex1 = m_aAcceptString.indexOf( (sal_Unicode) ';' );
         if (nIndex1 < 0) throw IllegalArgumentException(
-            OUString::createFromAscii("Invalid accept-string format"), m_rContext, 1);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Invalid accept-string format")), m_rContext, 1);
         m_aConnectString = m_aAcceptString.copy( 0 , nIndex1 ).trim();
         nIndex1++;
         sal_Int32 nIndex2 = m_aAcceptString.indexOf( (sal_Unicode) ';' , nIndex1 );
@@ -200,7 +200,7 @@ void SAL_CALL Acceptor::initialize( const Sequence<Any>& aArguments )
     if (!bOk)
     {
         throw IllegalArgumentException(
-            OUString::createFromAscii("invalid initialization"), m_rContext, 1);
+            OUString(RTL_CONSTASCII_USTRINGPARAM("invalid initialization")), m_rContext, 1);
     }
 }
 
@@ -275,14 +275,14 @@ Reference<XInterface> SAL_CALL AccInstanceProvider::getInstance (const OUString&
     else if ( aName.compareToAscii("StarOffice.NamingService" ) == 0 )
     {
         Reference< XNamingService > rNamingService(
-            m_rSMgr->createInstance( OUString::createFromAscii( "com.sun.star.uno.NamingService" )),
+            m_rSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uno.NamingService" ))),
             UNO_QUERY );
         if ( rNamingService.is() )
         {
             rNamingService->registerObject(
-                OUString::createFromAscii( "StarOffice.ServiceManager" ), m_rSMgr );
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ServiceManager" )), m_rSMgr );
             rNamingService->registerObject(
-                OUString::createFromAscii( "StarOffice.ComponentContext" ), getComponentContext( m_rSMgr ));
+                OUString(RTL_CONSTASCII_USTRINGPARAM( "StarOffice.ComponentContext" )), getComponentContext( m_rSMgr ));
             rInstance = rNamingService;
         }
     }
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
index 9712aa6eaf72..40fc3e451c33 100644
--- a/desktop/source/so_comp/evaluation.cxx
+++ b/desktop/source/so_comp/evaluation.cxx
@@ -151,7 +151,7 @@ rtl::OUString SAL_CALL SOEvaluation::getExactName( const rtl::OUString& rApproxi
                     rValue.Value >>= aEval;
             }
             // append eval string to title
-            aTitle += OUString::createFromAscii(" ") + aEval;
+            aTitle += OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + aEval;
             if ( bExpired )
                 throw RuntimeException();
         }
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index e2e9a05a9a80..321cc90c7296 100644
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
@@ -151,7 +151,7 @@ throw ( RuntimeException )
     {
         // create OEM preload service dialog
         Reference <XExecutableDialog> xDialog( m_xServiceManager->createInstance(
-            OUString::createFromAscii("org.openoffice.comp.preload.OEMPreloadWizard")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.preload.OEMPreloadWizard"))),
             UNO_QUERY );
         if ( xDialog.is() ){
             // execute OEM preload dialog and check return value
@@ -165,7 +165,7 @@ throw ( RuntimeException )
                 // terminate.
                 /*
                 Reference< XDesktop > xDesktop( m_xServiceManager->createInstance(
-                    OUString::createFromAscii("com.sun.star.frame.Desktop")),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))),
                     UNO_QUERY );
                 xDesktop->terminate();
                 */
@@ -199,7 +199,7 @@ throw ( RuntimeException )
     }
     /*
     NamedValue nv;
-    nv.Name  = OUString::createFromAscii("Deactivate");
+    nv.Name  = OUString(RTL_CONSTASCII_USTRINGPARAM("Deactivate"));
     nv.Value <<=  bDeactivate;
     Sequence<NamedValue> s(1);
     s[0] = nv;
@@ -209,7 +209,6 @@ throw ( RuntimeException )
     return r;
 }
 
-
 static sal_Bool existsURL( OUString const& _sURL )
 {
     using namespace osl;
@@ -221,7 +220,6 @@ static sal_Bool existsURL( OUString const& _sURL )
     return sal_False;
 }
 
-
 // locate soffice.ini/.rc file
 static OUString locateIniFile()
 {
diff --git a/desktop/source/so_comp/services.cxx b/desktop/source/so_comp/services.cxx
index a4709b632f27..1eedd4d47bda 100644
--- a/desktop/source/so_comp/services.cxx
+++ b/desktop/source/so_comp/services.cxx
@@ -72,7 +72,6 @@ static const fProvider pInstanceProviders[] =
     NULL
 };
 
-
 static const char** pSupportedServices[] =
 {
     SOEvaluation::interfaces,
@@ -118,9 +117,9 @@ component_writeInfo(
     for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) {
         pServiceName= pServices[i];
         pImplName = pImplementations[i];
-        aImpl = OUString::createFromAscii("/")
+        aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
               + OUString::createFromAscii(pImplName)
-              + OUString::createFromAscii("/UNO/SERVICES");
+              + OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
         Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl);
         xNewKey->createKey(OUString::createFromAscii(pServiceName));
     }
diff --git a/desktop/source/splash/services_spl.cxx b/desktop/source/splash/services_spl.cxx
index 1421f53e2401..b63f89792a29 100644
--- a/desktop/source/splash/services_spl.cxx
+++ b/desktop/source/splash/services_spl.cxx
@@ -37,7 +37,6 @@
 
 #include "splash.hxx"
 
-
 using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -65,7 +64,6 @@ static const fProvider pInstanceProviders[] =
     NULL
 };
 
-
 static const char** pSupportedServices[] =
 {
     SplashScreen::interfaces,
@@ -110,9 +108,9 @@ component_writeInfo(
     for (int i = 0; (pServices[i]!=NULL)&&(pImplementations[i]!=NULL); i++) {
         pServiceName= pServices[i];
         pImplName = pImplementations[i];
-        aImpl = OUString::createFromAscii("/")
+        aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM("/"))
               + OUString::createFromAscii(pImplName)
-              + OUString::createFromAscii("/UNO/SERVICES");
+              + OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
         Reference<XRegistryKey> xNewKey = xKey->createKey(aImpl);
         xNewKey->createKey(OUString::createFromAscii(pServiceName));
     }
diff --git a/desktop/unx/splash/services_unxsplash.cxx b/desktop/unx/splash/services_unxsplash.cxx
index 6e8b63afa57c..f83c7f6d2727 100644
--- a/desktop/unx/splash/services_unxsplash.cxx
+++ b/desktop/unx/splash/services_unxsplash.cxx
@@ -111,9 +111,9 @@ component_writeInfo(
     {
         pServiceName= pServices[i];
         pImplName = pImplementations[i];
-        aImpl = OUString::createFromAscii( "/" )
+        aImpl = OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ))
               + OUString::createFromAscii( pImplName )
-              + OUString::createFromAscii( "/UNO/SERVICES" );
+              + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
         Reference<XRegistryKey> xNewKey = xKey->createKey( aImpl );
         xNewKey->createKey( OUString::createFromAscii( pServiceName ) );
     }