String->OUString in svl::ImpSvNumberformatInfo

Change-Id: Iff00b06a1e4e7c485e70ef0537fdea07ce3d42e5

4 files changed, 50 insertions, 50 deletions

diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 0418fcad97b1..1a352825e617 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -65,7 +65,7 @@ enum NfHackConversion
 
 struct ImpSvNumberformatInfo            // Struct for FormatInfo
 {
-    String* sStrArray;                  // Array of symbols
+    OUString* sStrArray;                // Array of symbols
     short* nTypeArray;                  // Array of infos
     sal_uInt16 nThousand;               // Count of group separator sequences
     sal_uInt16 nCntPre;                 // Count of digits before decimal point
@@ -281,7 +281,7 @@ public:
     // Substring of a subformat code nNumFor (0..3)
     // nPos == 0xFFFF => last substring
     // bString==true: first/last SYMBOLTYPE_STRING or SYMBOLTYPE_CURRENCY
-    const String* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
+    const OUString* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
             bool bString = false ) const;
 
     // Subtype of a subformat code nNumFor (0..3)
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index fb5bbe3ad821..69d676181f46 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2466,7 +2466,7 @@ bool ImpSvNumberInputScan::ScanStringNumFor(
     if ( !pFormat )
         return false;
     const ::utl::TransliterationWrapper* pTransliteration = pFormatter->GetTransliteration();
-    const String* pStr;
+    const OUString* pStr;
     rtl::OUString aString( rString );
     bool bFound = false;
     bool bFirst = true;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 5cf224ba451e..5c4c31c7fcf3 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -353,7 +353,7 @@ void ImpSvNumFor::Enlarge(sal_uInt16 nAnz)
         if ( nAnz )
         {
             aI.nTypeArray = new short[nAnz];
-            aI.sStrArray  = new String[nAnz];
+            aI.sStrArray  = new OUString[nAnz];
         }
         else
         {
@@ -2051,13 +2051,13 @@ bool SvNumberformat::GetOutputString(String& sString,
                     if( bStarFlag )
                     {
                         OutString += (sal_Unicode) 0x1B;
-                        OutString += rInfo.sStrArray[i].GetChar(1);
+                        OutString += rInfo.sStrArray[i][1];
                         bRes = true;
                     }
                 break;
                 case NF_SYMBOLTYPE_BLANK:
                     InsertBlanks( OutString, OutString.Len(),
-                        rInfo.sStrArray[i].GetChar(1) );
+                        rInfo.sStrArray[i][1] );
                 break;
                 case NF_KEY_GENERAL :   // #77026# "General" is the same as "@"
                 case NF_SYMBOLTYPE_DEL :
@@ -2319,13 +2319,13 @@ bool SvNumberformat::GetOutputString(double fNumber,
                             if( bStarFlag )
                             {
                                 OutString += (sal_Unicode) 0x1B;
-                                OutString += rInfo.sStrArray[i].GetChar(1);
+                                OutString += rInfo.sStrArray[i][1];
                                 bRes = true;
                             }
                             break;
                         case NF_SYMBOLTYPE_BLANK:
                             InsertBlanks( OutString, OutString.Len(),
-                                rInfo.sStrArray[i].GetChar(1) );
+                                rInfo.sStrArray[i][1] );
                             break;
                         case NF_SYMBOLTYPE_STRING:
                         case NF_SYMBOLTYPE_CURRENCY:
@@ -2586,7 +2586,7 @@ bool SvNumberformat::GetOutputString(double fNumber,
                     if (rInfo.nCntPre > 0 && nFrac == 0)
                         sDiv.Insert(' ',0);
                     else
-                        sDiv.Insert( rInfo.sStrArray[j].GetChar(0), 0 );
+                        sDiv.Insert( rInfo.sStrArray[j][0], 0 );
                     if ( j )
                         j--;
                     else
@@ -2845,13 +2845,13 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
                 if( bStarFlag )
                 {
                     OutString += (sal_Unicode) 0x1B;
-                    OutString += rInfo.sStrArray[i].GetChar(1);
+                    OutString += rInfo.sStrArray[i][1];
                     bRes = true;
                 }
                 break;
             case NF_SYMBOLTYPE_BLANK:
                 InsertBlanks( OutString, OutString.Len(),
-                    rInfo.sStrArray[i].GetChar(1) );
+                    rInfo.sStrArray[i][1] );
                 break;
             case NF_SYMBOLTYPE_STRING:
             case NF_SYMBOLTYPE_CURRENCY:
@@ -2865,7 +2865,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
                 xub_StrLen nLen = ( bInputLine && i > 0 &&
                     (rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING ||
                      rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ?
-                    nCntPost : rInfo.sStrArray[i].Len() );
+                    nCntPost : rInfo.sStrArray[i].getLength() );
                 for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++)
                 {
                     OutString += sSecStr.GetChar(nSecPos);
@@ -2966,11 +2966,11 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& r
                         xub_StrLen nLen;
                         if ((i < nCount-1 &&
                                     rInfo.nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
-                                    rInfo.sStrArray[i+1].GetChar(0) != ' ') ||
+                                    rInfo.sStrArray[i+1][0] != ' ') ||
                                 (i > 0 &&
                                  rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING &&
-                                 ((nLen = rInfo.sStrArray[i-1].Len()) > 0) &&
-                                 rInfo.sStrArray[i-1].GetChar(nLen-1) != ' '))
+                                 ((nLen = rInfo.sStrArray[i-1].getLength()) > 0) &&
+                                 rInfo.sStrArray[i-1][nLen-1] != ' '))
                             io_nState = 1;
                         else if (bDaySeen)
                             io_nState = 3;
@@ -3285,13 +3285,13 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
                 if( bStarFlag )
                 {
                     OutString += (sal_Unicode) 0x1B;
-                    OutString += rInfo.sStrArray[i].GetChar(1);
+                    OutString += rInfo.sStrArray[i][1];
                     bRes = true;
                 }
             break;
             case NF_SYMBOLTYPE_BLANK:
                 InsertBlanks( OutString, OutString.Len(),
-                    rInfo.sStrArray[i].GetChar(1) );
+                    rInfo.sStrArray[i][1] );
             break;
             case NF_SYMBOLTYPE_STRING:
             case NF_SYMBOLTYPE_CURRENCY:
@@ -3572,13 +3572,13 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
                 if( bStarFlag )
                 {
                     OutString += (sal_Unicode) 0x1B;
-                    OutString += rInfo.sStrArray[i].GetChar(1);
+                    OutString += rInfo.sStrArray[i][1];
                     bRes = true;
                 }
                 break;
             case NF_SYMBOLTYPE_BLANK:
                 InsertBlanks( OutString, OutString.Len(),
-                    rInfo.sStrArray[i].GetChar(1) );
+                    rInfo.sStrArray[i][1] );
                 break;
             case NF_SYMBOLTYPE_STRING:
             case NF_SYMBOLTYPE_CURRENCY:
@@ -3592,7 +3592,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
                 xub_StrLen nLen = ( bInputLine && i > 0 &&
                     (rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING ||
                      rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ?
-                    nCntPost : rInfo.sStrArray[i].Len() );
+                    nCntPost : rInfo.sStrArray[i].getLength() );
                 for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++)
                 {
                     OutString += sSecStr.GetChar(nSecPos);
@@ -3885,13 +3885,13 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
                 case NF_SYMBOLTYPE_STAR:
                     if( bStarFlag )
                     {
-                        sStr.Insert(rInfo.sStrArray[j].GetChar(1),k);
+                        sStr.Insert(rInfo.sStrArray[j][1], k);
                         sStr.Insert( (sal_Unicode) 0x1B, k );
                         bRes = true;
                     }
                     break;
                 case NF_SYMBOLTYPE_BLANK:
-                    /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) );
+                    /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
                     break;
                 case NF_SYMBOLTYPE_STRING:
                 case NF_SYMBOLTYPE_CURRENCY:
@@ -4000,18 +4000,18 @@ bool SvNumberformat::ImpNumberFillWithThousands(
                 sStr.Insert(rInfo.sStrArray[j],k);
                 if ( k == 0 )
                     nLeadingStringChars =
-                        nLeadingStringChars + rInfo.sStrArray[j].Len();
+                        nLeadingStringChars + rInfo.sStrArray[j].getLength();
             break;
             case NF_SYMBOLTYPE_STAR:
                 if( bStarFlag )
                 {
-                    sStr.Insert(rInfo.sStrArray[j].GetChar(1),k);
+                    sStr.Insert(rInfo.sStrArray[j][1], k);
                     sStr.Insert( (sal_Unicode) 0x1B, k );
                     bRes = true;
                 }
                 break;
             case NF_SYMBOLTYPE_BLANK:
-                /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) );
+                /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
                 break;
             case NF_SYMBOLTYPE_THSEP:
             {
@@ -4169,13 +4169,13 @@ bool SvNumberformat::ImpNumberFill( String& sStr,       // number string
             case NF_SYMBOLTYPE_STAR:
                 if( bStarFlag )
                 {
-                    sStr.Insert(rInfo.sStrArray[j].GetChar(1),k);
+                    sStr.Insert(rInfo.sStrArray[j][1], k);
                     sStr.Insert( sal_Unicode(0x1B), k );
                     bRes = true;
                 }
                 break;
             case NF_SYMBOLTYPE_BLANK:
-                k = InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) );
+                k = InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
                 break;
             case NF_SYMBOLTYPE_THSEP:
             {
@@ -4287,7 +4287,7 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType,
             short nType = rInfo.nTypeArray[i];
             if ( nType == NF_SYMBOLTYPE_DIGIT)
             {
-                register const sal_Unicode* p = rInfo.sStrArray[i].GetBuffer();
+                const sal_Unicode* p = rInfo.sStrArray[i].getStr();
                 while ( *p == '#' )
                     p++;
                 while ( *p++ == '0' )
@@ -4300,7 +4300,7 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType,
     }
 }
 
-const String* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
+const OUString* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
             bool bString /* = false */ ) const
 {
     if ( nNumFor > 3 )
@@ -4387,7 +4387,7 @@ bool SvNumberformat::IsNegativeWithoutSign() const
 {
     if ( IsNegativeRealNegative() )
     {
-        const String* pStr = GetNumForString( 1, 0, true );
+        const OUString* pStr = GetNumForString( 1, 0, true );
         if ( pStr )
             return !HasStringNegativeSign( *pStr );
     }
@@ -4400,7 +4400,7 @@ bool SvNumberformat::IsNegativeInBracket() const
     if (!nAnz)
         return false;
 
-    String *tmpStr = NumFor[1].Info().sStrArray;
+    OUString *tmpStr = NumFor[1].Info().sStrArray;
     using comphelper::string::equals;
     return (equals(tmpStr[0], '(') && equals(tmpStr[nAnz-1], ')'));
 }
@@ -4408,8 +4408,8 @@ bool SvNumberformat::IsNegativeInBracket() const
 bool SvNumberformat::HasPositiveBracketPlaceholder() const
 {
     sal_uInt16 nAnz = NumFor[0].GetCount();
-    String *tmpStr = NumFor[0].Info().sStrArray;
-    return (tmpStr[nAnz-1].EqualsAscii( "_)" ));
+    OUString *tmpStr = NumFor[0].Info().sStrArray;
+    return (tmpStr[nAnz-1].equalsAscii( "_)" ));
 }
 
 DateFormat SvNumberformat::GetDateOrder() const
@@ -4639,7 +4639,7 @@ String SvNumberformat::GetMappedFormatstring(
         if ( nAnz )
         {
             const short* pType = NumFor[n].Info().nTypeArray;
-            const String* pStr = NumFor[n].Info().sStrArray;
+            const OUString* pStr = NumFor[n].Info().sStrArray;
             for ( sal_uInt16 j=0; j<nAnz; j++ )
             {
                 if ( 0 <= pType[j] && pType[j] < NF_KEYWORD_ENTRIES_COUNT )
@@ -4670,7 +4670,7 @@ String SvNumberformat::GetMappedFormatstring(
                         case NF_SYMBOLTYPE_STRING :
                             if( bDontQuote )
                                 aStr += pStr[j];
-                            else if ( pStr[j].Len() == 1 )
+                            else if ( pStr[j].getLength() == 1 )
                             {
                                 aStr += '\\';
                                 aStr += pStr[j];
@@ -4683,7 +4683,7 @@ String SvNumberformat::GetMappedFormatstring(
                             }
                             break;
                         case NF_SYMBOLTYPE_CALDEL :
-                            if ( pStr[j+1].EqualsAscii("buddhist") )
+                            if ( pStr[j+1].equalsAscii("buddhist") )
                             {
                                 aStr.InsertAscii( "[$-", 0 );
                                 if ( rNum.IsSet() && rNum.GetNatNum() == 1 &&
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index d11e5ee05a27..63f8f8ecad5a 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -1169,7 +1169,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
         while (!bEnd)
         {
             short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False );
-            const XubString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
+            const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
 
             switch ( nElemType )
             {
@@ -1178,17 +1178,17 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                     break;
                 case NF_SYMBOLTYPE_DIGIT:
                     if ( bExpFound && pElemStr )
-                        nExpDigits += pElemStr->Len();
-                    else if ( !bDecDashes && pElemStr && pElemStr->GetChar(0) == '-' )
+                        nExpDigits += pElemStr->getLength();
+                    else if ( !bDecDashes && pElemStr && (*pElemStr)[0] == '-' )
                         bDecDashes = sal_True;
-                    else if ( !bVarDecimals && !bInInteger && pElemStr && pElemStr->GetChar(0) == '#' )
+                    else if ( !bVarDecimals && !bInInteger && pElemStr && (*pElemStr)[0] == '#' )
                     {
                         //  If the decimal digits string starts with a '#', variable
                         //  decimals is assumed (for 0.###, but not 0.0##).
                         bVarDecimals = sal_True;
                     }
                     if ( bInInteger && pElemStr )
-                        nIntegerSymbols += pElemStr->Len();
+                        nIntegerSymbols += pElemStr->getLength();
                     nTrailingThousands = 0;
                     break;
                 case NF_SYMBOLTYPE_DECSEP:
@@ -1196,7 +1196,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                     break;
                 case NF_SYMBOLTYPE_THSEP:
                     if (pElemStr)
-                        nTrailingThousands += pElemStr->Len();      // is reset to 0 if digits follow
+                        nTrailingThousands += pElemStr->getLength();      // is reset to 0 if digits follow
                     break;
                 case NF_SYMBOLTYPE_EXP:
                     bExpFound = sal_True;           // following digits are exponent digits
@@ -1236,7 +1236,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
             while (!bEnd)
             {
                 short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False );
-                const XubString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
+                const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
 
                 switch ( nElemType )
                 {
@@ -1245,7 +1245,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                         break;
                     case NF_SYMBOLTYPE_DIGIT:
                         if ( pElemStr )
-                            nDigitsPassed += pElemStr->Len();
+                            nDigitsPassed += pElemStr->getLength();
                         break;
                     case NF_SYMBOLTYPE_STRING:
                     case NF_SYMBOLTYPE_BLANK:
@@ -1258,7 +1258,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                             if ( nElemType == NF_SYMBOLTYPE_STRING || nElemType == NF_SYMBOLTYPE_PERCENT )
                                 aEmbeddedStr = *pElemStr;
                             else
-                                SvNumberformat::InsertBlanks( aEmbeddedStr, 0, pElemStr->GetChar(1) );
+                                SvNumberformat::InsertBlanks( aEmbeddedStr, 0, (*pElemStr)[1] );
 
                             sal_Int32 nEmbedPos = nIntegerSymbols - nDigitsPassed;
 
@@ -1281,7 +1281,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
         while (!bEnd)
         {
             short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False );
-            const XubString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
+            const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
 
             switch ( nElemType )
             {
@@ -1328,7 +1328,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                         //  (#i20396# the spaces may also be in embedded-text elements)
 
                         String aBlanks;
-                        SvNumberformat::InsertBlanks( aBlanks, 0, pElemStr->GetChar(1) );
+                        SvNumberformat::InsertBlanks( aBlanks, 0, (*pElemStr)[1] );
                         AddToTextElement_Impl( aBlanks );
                     }
                     break;
@@ -1415,7 +1415,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                             case NUMBERFORMAT_FRACTION:
                                 {
                                     sal_Int32 nInteger = nLeading;
-                                    if ( pElemStr && pElemStr->GetChar(0) == '?' )
+                                    if ( pElemStr && (*pElemStr)[0] == '?' )
                                     {
                                         //  If the first digit character is a question mark,
                                         //  the fraction doesn't have an integer part, and no
@@ -1575,8 +1575,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
                     // export only if ODF 1.2 extensions are enabled
                     if( SvtSaveOptions().GetODFDefaultVersion() > SvtSaveOptions::ODFVER_012 )
                     {
-                        if ( pElemStr && pElemStr->Len() > 1 )
-                            WriteRepeatedElement_Impl( pElemStr->GetChar( 1 ) );
+                        if ( pElemStr && pElemStr->getLength() > 1 )
+                            WriteRepeatedElement_Impl( (*pElemStr)[1] );
                     }
                     break;
             }