simplify CharClass

multiple variants of toUpper (etc)
some that take a non-const OUString or String and modify it
some that take a const OUString or String and return a new one
some that take part of a const OUString or String and return a new one

4 files changed, 37 insertions, 39 deletions

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 6e1cde011235..ef76faca7763 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -668,7 +668,7 @@ bool ImpSvNumberInputScan::GetCurrency( const String& rString, xub_StrLen& nPos,
         {   // if no format specified the currency of the initialized formatter
             LanguageType eLang = (pFormat ? pFormat->GetLanguage() :
                 pFormatter->GetLanguage());
-            aUpperCurrSymbol = pFormatter->GetCharClass()->upper(
+            aUpperCurrSymbol = pFormatter->GetCharClass()->uppercase(
                 SvNumberFormatter::GetCurrencyEntry( eLang ).GetSymbol() );
         }
         if ( StringContains( aUpperCurrSymbol, rString, nPos ) )
@@ -683,7 +683,7 @@ bool ImpSvNumberInputScan::GetCurrency( const String& rString, xub_StrLen& nPos,
             {
                 if ( aSymbol.Len() <= rString.Len() - nPos )
                 {
-                    pFormatter->GetCharClass()->toUpper( aSymbol );
+                    aSymbol = pFormatter->GetCharClass()->uppercase(aSymbol);
                     if ( StringContains( aSymbol, rString, nPos ) )
                     {
                         nPos = nPos + aSymbol.Len();
@@ -719,13 +719,13 @@ bool ImpSvNumberInputScan::GetTimeAmPm( const String& rString, xub_StrLen& nPos
     {
         const CharClass* pChr = pFormatter->GetCharClass();
         const LocaleDataWrapper* pLoc = pFormatter->GetLocaleData();
-        if ( StringContains( pChr->upper( pLoc->getTimeAM() ), rString, nPos ) )
+        if ( StringContains( pChr->uppercase( pLoc->getTimeAM() ), rString, nPos ) )
         {
             nAmPm = 1;
             nPos = nPos + pLoc->getTimeAM().Len();
             return true;
         }
-        else if ( StringContains( pChr->upper( pLoc->getTimePM() ), rString, nPos ) )
+        else if ( StringContains( pChr->uppercase( pLoc->getTimePM() ), rString, nPos ) )
         {
             nAmPm = -1;
             nPos = nPos + pLoc->getTimePM().Len();
@@ -2456,8 +2456,8 @@ void ImpSvNumberInputScan::InitText()
     pUpperAbbrevMonthText = new String[nElems];
     for ( j=0; j<nElems; j++ )
     {
-        pUpperMonthText[j] = pChrCls->upper( xElems[j].FullName );
-        pUpperAbbrevMonthText[j] = pChrCls->upper( xElems[j].AbbrevName );
+        pUpperMonthText[j] = pChrCls->uppercase( xElems[j].FullName );
+        pUpperAbbrevMonthText[j] = pChrCls->uppercase( xElems[j].AbbrevName );
     }
 
     delete [] pUpperGenitiveMonthText;
@@ -2469,8 +2469,8 @@ void ImpSvNumberInputScan::InitText()
     pUpperGenitiveAbbrevMonthText = new String[nElems];
     for ( j=0; j<nElems; j++ )
     {
-        pUpperGenitiveMonthText[j] = pChrCls->upper( xElems[j].FullName );
-        pUpperGenitiveAbbrevMonthText[j] = pChrCls->upper( xElems[j].AbbrevName );
+        pUpperGenitiveMonthText[j] = pChrCls->uppercase( xElems[j].FullName );
+        pUpperGenitiveAbbrevMonthText[j] = pChrCls->uppercase( xElems[j].AbbrevName );
         if (!bScanGenitiveMonths &&
                 (pUpperGenitiveMonthText[j] != pUpperMonthText[j] ||
                  pUpperGenitiveAbbrevMonthText[j] != pUpperAbbrevMonthText[j]))
@@ -2486,8 +2486,8 @@ void ImpSvNumberInputScan::InitText()
     pUpperPartitiveAbbrevMonthText = new String[nElems];
     for ( j=0; j<nElems; j++ )
     {
-        pUpperPartitiveMonthText[j] = pChrCls->upper( xElems[j].FullName );
-        pUpperPartitiveAbbrevMonthText[j] = pChrCls->upper( xElems[j].AbbrevName );
+        pUpperPartitiveMonthText[j] = pChrCls->uppercase( xElems[j].FullName );
+        pUpperPartitiveAbbrevMonthText[j] = pChrCls->uppercase( xElems[j].AbbrevName );
         if (!bScanPartitiveMonths &&
                 (pUpperPartitiveMonthText[j] != pUpperGenitiveMonthText[j] ||
                  pUpperPartitiveAbbrevMonthText[j] != pUpperGenitiveAbbrevMonthText[j]))
@@ -2502,8 +2502,8 @@ void ImpSvNumberInputScan::InitText()
     pUpperAbbrevDayText = new String[nElems];
     for ( j=0; j<nElems; j++ )
     {
-        pUpperDayText[j] = pChrCls->upper( xElems[j].FullName );
-        pUpperAbbrevDayText[j] = pChrCls->upper( xElems[j].AbbrevName );
+        pUpperDayText[j] = pChrCls->uppercase( xElems[j].FullName );
+        pUpperAbbrevDayText[j] = pChrCls->uppercase( xElems[j].AbbrevName );
     }
 
     bTextInitialized = true;
@@ -2568,7 +2568,7 @@ bool ImpSvNumberInputScan::IsNumberFormat(
     else
     {
         // NoMoreUpperNeeded, all comparisons on UpperCase
-        aString = pFormatter->GetCharClass()->upper( rString );
+        aString = pFormatter->GetCharClass()->uppercase( rString );
         // convert native number to ASCII if necessary
         TransformInput( aString );
         res = IsNumberFormatMain( aString, fOutNumber, pFormat );
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index b2484130f2a2..908b437b4a5a 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1637,7 +1637,7 @@ bool SvNumberFormatter::GetPreviewStringGuess( const String& sFormatString,
     eLnge = ActLnge;
     bool bEnglish = (eLnge == LANGUAGE_ENGLISH_US);
 
-    String aFormatStringUpper( pCharClass->upper( sFormatString ) );
+    String aFormatStringUpper( pCharClass->uppercase( sFormatString ) );
     sal_uInt32 nCLOffset = ImpGenerateCL( eLnge );
     sal_uInt32 nKey = ImpIsEntry( aFormatStringUpper, nCLOffset, eLnge );
     if ( nKey != NUMBERFORMAT_ENTRY_NOT_FOUND )
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 13c4ab901eff..d7969803459d 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1404,8 +1404,8 @@ short SvNumberformat::ImpNextSymbol(String& rString,
                     {
                         const String aNatNum(RTL_CONSTASCII_USTRINGPARAM("NATNUM"));
                         const String aDBNum(RTL_CONSTASCII_USTRINGPARAM("DBNUM"));
-                        String aUpperNatNum( rChrCls().toUpper( rString, nPos-1, aNatNum.Len() ) );
-                        String aUpperDBNum( rChrCls().toUpper( rString, nPos-1, aDBNum.Len() ) );
+                        String aUpperNatNum( rChrCls().uppercase( rString, nPos-1, aNatNum.Len() ) );
+                        String aUpperDBNum( rChrCls().uppercase( rString, nPos-1, aDBNum.Len() ) );
                         sal_Unicode cUpper = aUpperNatNum.GetChar(0);
                         sal_Int32 nNatNumNum = rString.Copy( nPos-1+aNatNum.Len() ).ToInt32();
                         sal_Unicode cDBNum = rString.GetChar( nPos-1+aDBNum.Len() );
@@ -1466,7 +1466,7 @@ short SvNumberformat::ImpNextSymbol(String& rString,
                 }
                 else
                 {
-                    sal_Unicode cUpper = rChrCls().toUpper( rString, nPos-1, 1 ).GetChar(0);
+                    sal_Unicode cUpper = rChrCls().uppercase(rString, nPos-1, 1)[0];
                     if (cUpper == rKeywords[NF_KEY_H].GetChar(0)    ||  // H
                         cUpper == rKeywords[NF_KEY_MI].GetChar(0)   ||  // M
                         cUpper == rKeywords[NF_KEY_S].GetChar(0)    )   // S
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 3c7074a52daa..e1f1ac18c200 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -136,7 +136,7 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const
     {
         case NF_KEY_TRUE :
             ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_TRUE] =
-                pFormatter->GetCharClass()->upper(
+                pFormatter->GetCharClass()->uppercase(
                 pFormatter->GetLocaleData()->getTrueWord() );
             if ( !sKeyword[NF_KEY_TRUE].Len() )
             {
@@ -146,7 +146,7 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const
         break;
         case NF_KEY_FALSE :
             ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE] =
-                pFormatter->GetCharClass()->upper(
+                pFormatter->GetCharClass()->uppercase(
                 pFormatter->GetLocaleData()->getFalseWord() );
             if ( !sKeyword[NF_KEY_FALSE].Len() )
             {
@@ -165,7 +165,7 @@ void ImpSvNumberformatScan::InitCompatCur() const
     // currency symbol for old style ("automatic") compatibility format codes
     pFormatter->GetCompatibilityCurrency( pThis->sCurSymbol, pThis->sCurAbbrev );
     // currency symbol upper case
-    pThis->sCurString = pFormatter->GetCharClass()->upper( sCurSymbol );
+    pThis->sCurString = pFormatter->GetCharClass()->uppercase( sCurSymbol );
     bCompatCurNeedInit = false;
 }
 
@@ -235,7 +235,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 
     i18n::NumberFormatCode aFormat = aNumberFormatCode.getFormatCode( NF_NUMBER_STANDARD );
     sNameStandardFormat = lcl_extractStandardGeneralName( aFormat.Code);
-    sKeyword[NF_KEY_GENERAL] = pCharClass->upper( sNameStandardFormat );
+    sKeyword[NF_KEY_GENERAL] = pCharClass->uppercase( sNameStandardFormat );
 
     // preset new calendar keywords
     sKeyword[NF_KEY_AAA].AssignAscii( RTL_CONSTASCII_STRINGPARAM(   "AAA" ) );
@@ -462,7 +462,7 @@ void ImpSvNumberformatScan::ChangeStandardPrec(sal_uInt16 nPrec)
 
 Color* ImpSvNumberformatScan::GetColor(String& sStr)
 {
-    String sString = pFormatter->GetCharClass()->upper(sStr);
+    String sString = pFormatter->GetCharClass()->uppercase(sStr);
     const NfKeywordTable & rKeyword = GetKeywords();
     size_t i = 0;
     while (i < NF_MAX_DEFAULT_COLORS &&
@@ -528,7 +528,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
 
 short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos )
 {
-    String sString = pFormatter->GetCharClass()->toUpper( sSymbol, nPos, sSymbol.Len() - nPos );
+    String sString = pFormatter->GetCharClass()->uppercase( sSymbol, nPos, sSymbol.Len() - nPos );
     const NfKeywordTable & rKeyword = GetKeywords();
     // #77026# for the Xcl perverts: the GENERAL keyword is recognized anywhere
     if ( sString.Search( rKeyword[NF_KEY_GENERAL] ) == 0 )
@@ -647,8 +647,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
                         nPos-1 + sCurString.Len() <= rStr.Len() &&
                         !(nPos > 1 && rStr.GetChar( nPos-2 ) == '[') )
                 {
-                    String aTest( rStr.Copy( nPos-1, sCurString.Len() ) );
-                    pChrCls->toUpper( aTest );
+                    String aTest = pChrCls->uppercase( rStr.Copy( nPos-1, sCurString.Len() ) );
                     if ( aTest == sCurString )
                     {
                         sSymbol = rStr.Copy( --nPos, sCurString.Len() );
@@ -737,8 +736,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
                                     nPos-1 + sCurString.Len() <= rStr.Len() &&
                                     sCurString.Search( sKeyword[nTmpType] ) == 0 )
                                 {
-                                    String aTest( rStr.Copy( nPos-1, sCurString.Len() ) );
-                                    pChrCls->toUpper( aTest );
+                                    String aTest = pChrCls->uppercase( rStr.Copy( nPos-1, sCurString.Len() ) );
                                     if ( aTest == sCurString )
                                         bCurrency = true;
                                 }
@@ -878,7 +876,7 @@ xub_StrLen ImpSvNumberformatScan::Symbol_Division(const String& rString)
 {
     nCurrPos = STRING_NOTFOUND;
                                                     // Ist Waehrung im Spiel?
-    String sString = pFormatter->GetCharClass()->upper(rString);
+    String sString = pFormatter->GetCharClass()->uppercase(rString);
     xub_StrLen nCPos = 0;
     while (nCPos != STRING_NOTFOUND)
     {
@@ -1463,7 +1461,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
     String sOldTimeSep      = pLoc->getTimeSep();
     String sOldTime100SecSep= pLoc->getTime100SecSep();
     String sOldCurSymbol    = GetCurSymbol();
-    String sOldCurString    = GetCurString();
+    rtl::OUString sOldCurString = GetCurString();
     sal_Unicode cOldKeyH    = sKeyword[NF_KEY_H].GetChar(0);
     sal_Unicode cOldKeyMI   = sKeyword[NF_KEY_MI].GetChar(0);
     sal_Unicode cOldKeyS    = sKeyword[NF_KEY_S].GetChar(0);
@@ -2232,7 +2230,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
                                 if (bThousand)              // doppelt
                                     return nPos;
                                 bThousand = true;           // bei Time frei
-                                sal_Unicode cChar = pChrCls->upper( NextChar(i) ).GetChar(0);
+                                sal_Unicode cChar = pChrCls->uppercase(rtl::OUString(NextChar(i)))[0];
                                 if ( cChar == cOldKeyH )
                                     nThousand = 1;      // H
                                 else if ( cChar == cOldKeyMI )
@@ -2508,8 +2506,8 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
                         continue;   // for
                     // DM might be splitted into D and M
                     if ( sStrArray[i].Len() < sOldCurSymbol.Len() &&
-                            pChrCls->toUpper( sStrArray[i], 0, 1 ).GetChar(0) ==
-                            sOldCurString.GetChar(0) )
+                            pChrCls->uppercase( sStrArray[i], 0, 1 )[0] ==
+                            sOldCurString[0] )
                     {
                         String aTmp( sStrArray[i] );
                         sal_uInt16 j = i + 1;
@@ -2519,7 +2517,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
                         {
                             aTmp += sStrArray[j++];
                         }
-                        if ( pChrCls->upper( aTmp ) == sOldCurString )
+                        if ( pChrCls->uppercase( aTmp ) == sOldCurString )
                         {
                             sStrArray[i++] = aTmp;
                             for ( ; i<j; i++ )
@@ -2615,7 +2613,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
                         {   // dM -> DM  or  DM -> $  in old automatic
                             // currency formats, oh my ..., why did we ever
                             // introduce them?
-                            String aTmp( pChrCls->toUpper(
+                            String aTmp( pChrCls->uppercase(
                                 sStrArray[iPos], nArrPos,
                                 sStrArray[iPos].Len()-nArrPos ) );
                             xub_StrLen nCPos = aTmp.Search( sOldCurString );
@@ -2625,9 +2623,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
                                     bConvertMode && bConvertSystemToSystem ?
                                     GetCurSymbol() : sOldCurSymbol;
                                 sStrArray[iPos].Replace( nArrPos+nCPos,
-                                    sOldCurString.Len(), rCur );
+                                    sOldCurString.getLength(), rCur );
                                 rString.Replace( nStringPos+nCPos,
-                                    sOldCurString.Len(), rCur );
+                                    sOldCurString.getLength(), rCur );
                             }
                             nStringPos = rString.Len();
                             if ( iPos == i )
@@ -2648,7 +2646,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
                     i--;    // enter switch on next symbol again
                 if ( eScannedType == NUMBERFORMAT_CURRENCY && nStringPos < rString.Len() )
                 {   // same as above, since last RemoveQuotes
-                    String aTmp( pChrCls->toUpper(
+                    String aTmp( pChrCls->uppercase(
                         sStrArray[iPos], nArrPos,
                         sStrArray[iPos].Len()-nArrPos ) );
                     xub_StrLen nCPos = aTmp.Search( sOldCurString );
@@ -2658,9 +2656,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString )
                             bConvertMode && bConvertSystemToSystem ?
                             GetCurSymbol() : sOldCurSymbol;
                         sStrArray[iPos].Replace( nArrPos+nCPos,
-                            sOldCurString.Len(), rCur );
+                            sOldCurString.getLength(), rCur );
                         rString.Replace( nStringPos+nCPos,
-                            sOldCurString.Len(), rCur );
+                            sOldCurString.getLength(), rCur );
                     }
                 }
             }