targeted string re-work

Change-Id: I1efff8e09079267f4129c474872d3fc49adeb831

3 files changed, 19 insertions, 19 deletions

diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index af8e9369c16a..2590e7e05702 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -711,13 +711,13 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
             OUString aKey( aUsage + OUString( sal_Unicode(',')) + aType);
             if (!aDefaultsSet.insert( aKey).second)
             {
-                OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "Duplicated default for usage=\""));
+                OUString aStr(  "Duplicated default for usage=\"");
                 aStr += aUsage;
-                aStr += OUString( RTL_CONSTASCII_USTRINGPARAM( "\" type=\""));
+                aStr += OUString(  "\" type=\"");
                 aStr += aType;
-                aStr += OUString( RTL_CONSTASCII_USTRINGPARAM( "\": formatindex=\""));
+                aStr += OUString(  "\": formatindex=\"");
                 aStr += aFormatIndex;
-                aStr += OUString( RTL_CONSTASCII_USTRINGPARAM( "\"."));
+                aStr += OUString(  "\".");
                 incError( aStr);
             }
         }
@@ -786,10 +786,10 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
                     if (strcmp( of.getLocale(), "en_US") != 0)
                     {
                         OUString aCode( n->getValue());
-                        OUString aPar1( RTL_CONSTASCII_USTRINGPARAM( "0)" ));
-                        OUString aPar2( RTL_CONSTASCII_USTRINGPARAM( "-)" ));
-                        OUString aPar3( RTL_CONSTASCII_USTRINGPARAM( " )" ));
-                        OUString aPar4( RTL_CONSTASCII_USTRINGPARAM( "])" ));
+                        OUString aPar1( "0)");
+                        OUString aPar2( "-)" );
+                        OUString aPar3( " )" );
+                        OUString aPar4( "])" );
                         if (aCode.indexOf( aPar1 ) > 0 || aCode.indexOf( aPar2 ) > 0 ||
                                 aCode.indexOf( aPar3 ) > 0 || aCode.indexOf( aPar4 ) > 0)
                             fprintf( stderr, "Warning: FormatCode formatindex=\"%d\" for currency uses parentheses for negative amounts, which probably is not correct for locales not based on en_US.\n", formatindex);
@@ -1586,7 +1586,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             }
         }
         if (!ref_name.isEmpty() && daysNode == NULL) {
-            of.writeParameter("dayRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+            of.writeParameter("dayRef", OUString("ref"), i);
             of.writeParameter("dayRefName", ref_name, i);
             nbOfDays[i] = 0;
         } else {
@@ -1618,7 +1618,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             }
         }
         if (!ref_name.isEmpty() && monthsNode == NULL) {
-            of.writeParameter("monthRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+            of.writeParameter("monthRef", OUString("ref"), i);
             of.writeParameter("monthRefName", ref_name, i);
             nbOfMonths[i] = 0;
         } else {
@@ -1653,7 +1653,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             }
         }
         if (!ref_name.isEmpty() && genitiveMonthsNode == NULL) {
-            of.writeParameter("genitiveMonthRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+            of.writeParameter("genitiveMonthRef", OUString("ref"), i);
             of.writeParameter("genitiveMonthRefName", ref_name, i);
             nbOfGenitiveMonths[i] = 0;
         } else {
@@ -1689,7 +1689,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             }
         }
         if (!ref_name.isEmpty() && partitiveMonthsNode == NULL) {
-            of.writeParameter("partitiveMonthRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+            of.writeParameter("partitiveMonthRef", OUString("ref"), i);
             of.writeParameter("partitiveMonthRefName", ref_name, i);
             nbOfPartitiveMonths[i] = 0;
         } else {
@@ -1721,7 +1721,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             }
         }
         if (!ref_name.isEmpty() && erasNode == NULL) {
-            of.writeParameter("eraRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+            of.writeParameter("eraRef", OUString("ref"), i);
             of.writeParameter("eraRefName", ref_name, i);
             nbOfEras[i] = 0;
         } else {
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index e23270e0bea9..decd33fd4576 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -581,7 +581,7 @@ Sequence< CalendarItem2 > &LocaleData::getCalendarItemByName(const OUString& nam
         // Referred locale not found, return name for en_US locale.
         if (index == cals.getLength()) {
             cals = getAllCalendars2(
-                    Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(RTL_CONSTASCII_USTRINGPARAM("US")), OUString()));
+                    Locale(OUString("en"), OUString("US"), OUString()));
             if (cals.getLength() > 0)
                 ref_cal = cals[0];
             else
@@ -1053,7 +1053,7 @@ OUString SAL_CALL
 LocaleData::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException)
 {
     sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm);
-    return indexArray ? OUString(RTL_CONSTASCII_USTRINGPARAM("0-9"))+OUString(indexArray[2]) : OUString();
+    return indexArray ? OUString("0-9")+OUString(indexArray[2]) : OUString();
 }
 
 OUString SAL_CALL
@@ -1621,7 +1621,7 @@ sal_Bool OutlineNumbering::hasElements(  ) throw(RuntimeException)
 OUString SAL_CALL
 LocaleData::getImplementationName() throw( RuntimeException )
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM(clocaledata));
+    return OUString(clocaledata);
 }
 
 sal_Bool SAL_CALL
@@ -1635,7 +1635,7 @@ Sequence< OUString > SAL_CALL
 LocaleData::getSupportedServiceNames() throw( RuntimeException )
 {
     Sequence< OUString > aRet(1);
-    aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(clocaledata));
+    aRet[0] = OUString(clocaledata);
     return aRet;
 }
 
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 2a5fd1efbb36..deb30f323423 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -163,7 +163,7 @@ public: // Error handler
         ++nError;
         printf( "Error !\n" );
         throw  SAXException(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("error from error handler")) ,
+            OUString( "error from error handler") ,
             Reference < XInterface >() ,
             aSAXParseException );
     }
@@ -332,7 +332,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     // read xml from a file and count elements
     //--------------------------------
     Reference< XInterface > x = xSMgr->createInstance(
-        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) );
+        OUString("com.sun.star.xml.sax.Parser") );
     int nError = 0;
     if( x.is() )
     {