diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 68997ac1b778..2b04cdc01fc6 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -2336,7 +2336,7 @@ bool INetURLObject::setPassword(rtl::OUString const & rThePassword, else if (m_aHost.isPresent()) { m_aAbsURIRef.insert(m_aHost.getBegin(), - rtl::OUString::createFromAscii(":@")); + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ":@" ))); m_aUser.set(m_aAbsURIRef, rtl::OUString(), m_aHost.getBegin()); nDelta = m_aAuth.set(m_aAbsURIRef, aNewAuth, m_aHost.getBegin() + 1) + 2; diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index d4a92de5d589..e8d9129c2fb2 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -217,20 +217,20 @@ static String ImplMakeConfigName( const XubString* pFileName, if ( pFileName ) { #ifdef UNX - aFileName = ::rtl::OUString::createFromAscii( "." ); + aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." )); aFileName += *pFileName; - aFileName += ::rtl::OUString::createFromAscii( "rc" ); + aFileName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" )); #else aFileName = *pFileName; - aFileName += ::rtl::OUString::createFromAscii( ".ini" ); + aFileName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".ini" )); #endif } else { #ifdef UNX - aFileName = ::rtl::OUString::createFromAscii( ".sversionrc" ); + aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".sversionrc" )); #else - aFileName = ::rtl::OUString::createFromAscii( "sversion.ini" ); + aFileName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sversion.ini" )); #endif } @@ -249,7 +249,7 @@ static String ImplMakeConfigName( const XubString* pFileName, } ::rtl::OUString aName( aPathName ); - aName += ::rtl::OUString::createFromAscii( "/" ); + aName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" )); aName += aFileName; return aName; diff --git a/tools/source/generic/svlibrary.cxx b/tools/source/generic/svlibrary.cxx index be6772ffbcfa..5864bdf2c8a8 100644 --- a/tools/source/generic/svlibrary.cxx +++ b/tools/source/generic/svlibrary.cxx @@ -62,7 +62,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl() aUser .AppendAscii( "_user" ); uno::Reference< beans::XPropertySet > xPathSettings( xMgr->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.util.PathSettings" ) ), uno::UNO_QUERY_THROW ); + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSettings" )) ), uno::UNO_QUERY_THROW ); xPathSettings->getPropertyValue( aInternal ) >>= aInternalPaths; xPathSettings->getPropertyValue( aUser ) >>= aUserPaths; } diff --git a/tools/workben/urltest.cxx b/tools/workben/urltest.cxx index 0b0239a96f5a..2d3bd9b445f8 100644 --- a/tools/workben/urltest.cxx +++ b/tools/workben/urltest.cxx @@ -611,7 +611,7 @@ main() if (true) { rtl::OUString - aParameters(rtl::OUString::createFromAscii("; CharSet=UTF-8 ; Blubber=Blob")); + aParameters(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "; CharSet=UTF-8 ; Blubber=Blob" ))); sal_Unicode const * pBegin = aParameters.getStr(); sal_Unicode const * pEnd = pBegin + aParameters.getLength(); INetContentTypeParameterList aList; @@ -1451,7 +1451,7 @@ main() } if (true) { // #112130# - INetURLObject url1(rtl::OUString::createFromAscii(".uno:abc%3Fdef")); + INetURLObject url1(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:abc%3Fdef" ))); if (url1.GetProtocol() != INET_PROT_UNO) { printf("BAD .uno:abc%%3Fdef\n"); bSuccess = false; @@ -1469,7 +1469,7 @@ main() printf("BAD HasParam(.uno:abc%%3Fdef)\n"); bSuccess = false; } - INetURLObject url2(rtl::OUString::createFromAscii(".uno:abc?def?ghi")); + INetURLObject url2(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:abc?def?ghi" ))); if (url2.GetProtocol() != INET_PROT_UNO) { printf("BAD .uno:abc?def?ghi\n"); bSuccess = false;