i18npool: Use appropriate OUString functions on string constants

Change-Id: I6f2fabd9248b1b385439ff5c074342029fb660e0

13 files changed, 17 insertions, 17 deletions

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index ccea424cbb88..bd5ef43b5337 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -457,7 +457,7 @@ void TestBreakIterator::testWordBoundaries()
                 break;
             case 1:
                 aLocale.Language = "grc";
-                aLocale.Country = "";
+                aLocale.Country.clear();
                 break;
             default:
                 CPPUNIT_ASSERT(false);
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 8fe57f4774a0..b708b13fbe6e 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -540,7 +540,7 @@ bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUStrin
     }
 
     Reference < uno::XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
-            OUString("com.sun.star.i18n.BreakIterator_") + aLocaleName, m_xContext);
+            "com.sun.star.i18n.BreakIterator_" + aLocaleName, m_xContext);
 
     if ( xI.is() ) {
         xBI.set(xI, UNO_QUERY);
@@ -615,7 +615,7 @@ Sequence< OUString > SAL_CALL
 BreakIteratorImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.i18n.BreakIterator");
+    aRet[0] = "com.sun.star.i18n.BreakIterator";
     return aRet;
 }
 
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index e6bf29fb3f28..4780ce6ad598 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -70,7 +70,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr
 
     if (i >= sal::static_int_cast<sal_Int32>(lookupTable.size())) {
         Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
-                  OUString("com.sun.star.i18n.Calendar_") + uniqueID, m_xContext);
+                  "com.sun.star.i18n.Calendar_" + uniqueID, m_xContext);
 
         if ( ! xI.is() ) {
             // check if the calendar is defined in localedata, load gregorian calendar service.
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx
index e58598ebd54a..b65fd18324f4 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.cxx
@@ -273,7 +273,7 @@ sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName)
 Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.i18n.CharacterClassification_Unicode");
+    aRet[0] = "com.sun.star.i18n.CharacterClassification_Unicode";
     return aRet;
 }
 
diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index e109f0b0c084..2cf2dd00d9d7 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx
@@ -139,7 +139,7 @@ bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassifi
     }
 
     Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
-            OUString("com.sun.star.i18n.CharacterClassification_") + serviceName, m_xContext);
+            "com.sun.star.i18n.CharacterClassification_" + serviceName, m_xContext);
 
     Reference < XCharacterClassification > xCI;
     if ( xI.is() ) {
@@ -209,7 +209,7 @@ Sequence< OUString > SAL_CALL
 CharacterClassificationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.i18n.CharacterClassification");
+    aRet[0] = "com.sun.star.i18n.CharacterClassification";
     return aRet;
 }
 
diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index c696c0ea94d9..c20fbe712f41 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -78,7 +78,7 @@ UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( ::com
 UnoScriptTypeDetector::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception )
 {
     ::com::sun::star::uno::Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.i18n.ScriptTypeDetector");
+    aRet[0] = "com.sun.star.i18n.ScriptTypeDetector";
     return aRet;
 }
 
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index d11db2d6771e..fc5b48259575 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -227,7 +227,7 @@ Sequence< OUString > SAL_CALL
 CollatorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.i18n.Collator");
+    aRet[0] = "com.sun.star.i18n.Collator";
     return aRet;
 }
 
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index d790c19159db..10b3f3277d3f 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1061,7 +1061,7 @@ Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames(void)
                 throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.text.DefaultNumberingProvider");
+    aRet[0] = "com.sun.star.text.DefaultNumberingProvider";
     return aRet;
 }
 
diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index 73ee94159d31..fc109658fb40 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.cxx
@@ -100,7 +100,7 @@ throw (RuntimeException, std::exception)
 bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( RuntimeException )
 {
     Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
-            OUString("com.sun.star.i18n.IndexEntrySupplier_") + name, m_xContext);
+            "com.sun.star.i18n.IndexEntrySupplier_" + name, m_xContext);
 
     if ( xI.is() ) {
         xIES.set( xI, UNO_QUERY );
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index ed0b5ccf410a..039f5ed19c85 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -118,7 +118,7 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru
         }
 
         Reference < uno::XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext(
-                OUString("com.sun.star.i18n.InputSequenceChecker_") +
+                "com.sun.star.i18n.InputSequenceChecker_" +
                 OUString::createFromAscii(rLanguage),
                 m_xContext);
 
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 875ab3cea061..2953207a2e8b 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1077,7 +1077,7 @@ OUString SAL_CALL
 LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException)
 {
     sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
-    return indexArray ? OUString("0-9")+OUString(indexArray[2]) : OUString();
+    return indexArray ? "0-9"+OUString(indexArray[2]) : OUString();
 }
 
 OUString SAL_CALL
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index 85f40195128f..34e5e1ecb0ac 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -127,7 +127,7 @@ Sequence< OUString > SAL_CALL
 TextConversionImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.i18n.TextConversion");
+    aRet[0] = "com.sun.star.i18n.TextConversion";
     return aRet;
 }
 
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index b9e4445d63f5..1fb47350bbdb 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -611,7 +611,7 @@ bool SAL_CALL
 TransliterationImpl::loadModuleByName( const OUString& implName,
         Reference<XExtendedTransliteration>& body, const Locale& rLocale) throw(RuntimeException)
 {
-    OUString cname = OUString(TRLT_IMPLNAME_PREFIX) + implName;
+    OUString cname = TRLT_IMPLNAME_PREFIX + implName;
     loadBody(cname, body);
     if (body.is()) {
         body->loadModule((TransliterationModules)0, rLocale); // toUpper/toLoad need rLocale
@@ -622,7 +622,7 @@ TransliterationImpl::loadModuleByName( const OUString& implName,
                 if (i == 0) // current module is caseignore
                     body->loadModule(TMlist[0].tm, rLocale); // caseingore need to setup module name
                 if (! caseignore.is()) {
-                    OUString bname = OUString(TRLT_IMPLNAME_PREFIX) +
+                    OUString bname = TRLT_IMPLNAME_PREFIX +
                                 OUString::createFromAscii(TMlist[0].implName);
                     loadBody(bname, caseignore);
                 }
@@ -652,7 +652,7 @@ Sequence< OUString > SAL_CALL
 TransliterationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString("com.sun.star.i18n.Transliteration");
+    aRet[0] = "com.sun.star.i18n.Transliteration";
     return aRet;
 }