targeted string re-work

Change-Id: I1efff8e09079267f4129c474872d3fc49adeb831

3 files changed, 8 insertions, 8 deletions

diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index f9e3c56f91ac..3f2b2f1e4668 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.cxx
@@ -43,7 +43,7 @@ ChapterCollator::ChapterCollator( const Reference < XMultiServiceFactory >& rxMS
 {
     if ( rxMSF.is()) {
         Reference < XInterface > xI =
-        rxMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.CharacterClassification")));
+        rxMSF->createInstance( OUString("com.sun.star.i18n.CharacterClassification"));
         if ( xI.is() )
             xI->queryInterface(::getCppuType((const Reference< XCharacterClassification>*)0)) >>= cclass;
     }
@@ -76,7 +76,7 @@ ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int
     if( ans != 0 )
         return ans;
 
-    const OUString aAddAllowed(RTL_CONSTASCII_USTRINGPARAM("?"));
+    const OUString aAddAllowed("?");
     ParseResult res1, res2;
     // since parseAnyToken does not take length as parameter, we have to copy
     // it to a temp. string.
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 49f193e53328..93cc2a6a930d 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -44,7 +44,7 @@ CollatorImpl::CollatorImpl( const Reference < XMultiServiceFactory >& rxMSF ) :
 {
     if ( rxMSF.is()) {
         Reference < XInterface > xI =
-            xMSF->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.LocaleData")));
+            xMSF->createInstance( OUString("com.sun.star.i18n.LocaleData"));
         if ( xI.is() )
             xI->queryInterface(::getCppuType((const Reference< XLocaleData>*)0)) >>= localedata;
     }
@@ -168,7 +168,7 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic
     }
     if (xMSF.is()) {
         Reference < XInterface > xI =
-            xMSF->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.Collator_")) + serviceName);
+            xMSF->createInstance(OUString("com.sun.star.i18n.Collator_") + serviceName);
 
         if (xI.is()) {
             Reference < XCollator > xC;
@@ -195,8 +195,8 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS
     }
 
     static sal_Unicode under = (sal_Unicode) '_';
-    static OUString tw(RTL_CONSTASCII_USTRINGPARAM("TW"));
-    static OUString unicode(RTL_CONSTASCII_USTRINGPARAM("Unicode"));
+    static OUString tw("TW");
+    static OUString unicode("Unicode");
 
     sal_Int32 l = rLocale.Language.getLength();
     sal_Int32 c = rLocale.Country.getLength();
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 7cbb59833e70..02aea53ce87d 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -138,9 +138,9 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
                 aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_");
                 if ( rLocale.Language == "zh" ) {
                     OUString func_base = aBuf.makeStringAndClear();
-                    if (OUString(RTL_CONSTASCII_USTRINGPARAM("TW HK MO")).indexOf(rLocale.Country) >= 0)
+                    if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0)
                         func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule,
-                                    (func_base + OUString(RTL_CONSTASCII_USTRINGPARAM("TW_")) + rAlgorithm).pData);
+                                    (func_base + OUString("TW_") + rAlgorithm).pData);
                     if (!func)
                         func=(const sal_uInt8* (*)()) osl_getFunctionSymbol(hModule, (func_base + rAlgorithm).pData);
                 } else {