some UniString->rtl::OUString

Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3

3 files changed, 16 insertions, 17 deletions

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 58c6c148d86d..83ac5f345a4e 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -982,9 +982,9 @@ bool ImpSvNumberInputScan::MayBeIso8601()
         {
             sal_Int32 n;
             if (nAnzNums >= 3 && nNums[2] < nAnzStrings &&
-                    sStrArray[nNums[0]+1] == '-' &&                         // separator year-month
+                    comphelper::string::equals(sStrArray[nNums[0]+1], '-') && // separator year-month
                     (n = sStrArray[nNums[1]].ToInt32()) >= 1 && n <= 12 &&  // month
-                    sStrArray[nNums[1]+1] == '-' &&                         // separator month-day
+                    comphelper::string::equals(sStrArray[nNums[1]+1], '-') && // separator month-day
                     (n = sStrArray[nNums[2]].ToInt32()) >= 1 && n <= 31)    // day
                 // Year (nNums[0]) value not checked, may be anything, but
                 // length (number of digits) is checked.
@@ -1012,7 +1012,7 @@ bool ImpSvNumberInputScan::CanForceToIso8601( DateFormat eDateFormat )
                 break;
             }
 
-            if (pFormatter->GetDateSep() != '-')
+            if (!comphelper::string::equals(pFormatter->GetDateSep(), '-'))
             {
                 nCanForceToIso8601 = 2; // date separator does not interfere
                 break;
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 252ff7b46bba..a2291c678e31 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1988,10 +1988,11 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex(
     {   // we need at least _some_ format
         rSeq.realloc(1);
         rSeq[0] = ::com::sun::star::i18n::NumberFormatCode();
-        String aTmp( '0' );
-        aTmp += GetNumDecimalSep();
-        aTmp.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "############" ) );
-        rSeq[0].Code = aTmp;
+        rSeq[0].Code = rtl::OUStringBuffer().
+            append('0').
+            append(GetNumDecimalSep()).
+            appendAscii(RTL_CONSTASCII_STRINGPARAM("############")).
+            makeStringAndClear();
     }
     return 0;
 }
@@ -3624,6 +3625,11 @@ void SvNumberFormatter::ImpInitCurrencyTable()
 sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr,
             const NfCurrencyEntry& rCurr, bool bBank ) const
 {
+    rtl::OUString aRed = rtl::OUStringBuffer().
+        append('[').
+        append(pFormatScanner->GetRedString()).
+        append(']').makeStringAndClear();
+
     sal_uInt16 nDefault = 0;
     if ( bBank )
     {
@@ -3640,10 +3646,6 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr
         ::rtl::OUStringBuffer format2(aPositiveBank);
         format2.append(';');
 
-        String aRed( '[' );
-        aRed += pFormatScanner->GetRedString();
-        aRed += ']';
-
         format2.append(aRed);
 
         format2.append(aNegativeBank);
@@ -3658,10 +3660,6 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr
         String aPositive, aNegative, aPositiveNoDec, aNegativeNoDec,
             aPositiveDashed, aNegativeDashed;
 
-        String aRed( '[' );
-        aRed += pFormatScanner->GetRedString();
-        aRed += ']';
-
         rCurr.BuildPositiveFormatString( aPositive, false, *xLocaleData, 1 );
         rCurr.BuildNegativeFormatString( aNegative, false, *xLocaleData, 1 );
         ::rtl::OUStringBuffer format1;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 5b207171115e..5f30f3c37177 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3225,7 +3225,7 @@ bool SvNumberformat::ImpIsIso8601( const ImpSvNumFor& rNumFor )
                     break;
                 case NF_SYMBOLTYPE_STRING:
                 case NF_SYMBOLTYPE_DATESEP:
-                    if (rNumFor.Info().sStrArray[i] == '-')
+                    if (comphelper::string::equals(rNumFor.Info().sStrArray[i], '-'))
                     {
                         if (eState == eAtYear)
                             eState = eAtSep1;
@@ -4402,7 +4402,8 @@ bool SvNumberformat::IsNegativeInBracket() const
         return false;
 
     String *tmpStr = NumFor[1].Info().sStrArray;
-    return (tmpStr[0] == '(' && tmpStr[nAnz-1] == ')' );
+    using comphelper::string::equals;
+    return (equals(tmpStr[0], '(') && equals(tmpStr[nAnz-1], ')'));
 }
 
 bool SvNumberformat::HasPositiveBracketPlaceholder() const