From 45b19123a63f23fe37b11b063d7567bf79ef09aa Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 6 Jan 2012 23:00:40 +0000
Subject: 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
---
 editeng/source/items/svxfont.cxx |  6 +++---
 editeng/source/misc/svxacorr.cxx | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 5dcadd89d482..50800387e3d9 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -130,13 +130,13 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
         case SVX_CASEMAP_KAPITAELCHEN:
         case SVX_CASEMAP_VERSALIEN:
         {
-            aCharClass.toUpper( aTxt );
+            aTxt = aCharClass.uppercase( aTxt );
             break;
         }
 
         case SVX_CASEMAP_GEMEINE:
         {
-            aCharClass.toLower( aTxt );
+            aTxt = aCharClass.lowercase( aTxt );
             break;
         }
         case SVX_CASEMAP_TITEL:
@@ -155,7 +155,7 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
                     if( bBlank )
                     {
                         String aTemp( aTxt.GetChar( i ) );
-                        aCharClass.toUpper( aTemp );
+                        aTemp = aCharClass.uppercase( aTemp );
                         aTxt.Replace( i, 1, aTemp );
                     }
                     bBlank = sal_False;
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 159cde6fb71f..35d5b2099265 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -435,7 +435,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const String& rTxt,
             {
                 sal_Unicode cSave = rTxt.GetChar( nSttPos );
                 String sChar( cSave );
-                rCC.toLower( sChar );
+                sChar = rCC.lowercase( sChar );
                 if( sChar.GetChar(0) != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar ))
                 {
                     if( SaveWordWrdSttLst & nFlags )
@@ -883,7 +883,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
         {
             // valid separator -> replace
             String sChar( *pWordStt );
-            rCC.toUpper( sChar );
+            sChar = rCC.uppercase( sChar );
             return  sChar != *pWordStt &&
                     rDoc.ReplaceRange( xub_StrLen( pWordStt - pStart ), 1, sChar );
         }
@@ -1059,7 +1059,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
     sal_Unicode cSave = *pWordStt;
     nSttPos = sal::static_int_cast< xub_StrLen >( pWordStt - rTxt.GetBuffer() );
     String sChar( cSave );
-    rCC.toUpper( sChar );
+    sChar = rCC.uppercase( sChar );
     sal_Bool bRet = sChar.GetChar(0) != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar );
 
     // Parahaps someone wants to have the word
@@ -1087,8 +1087,8 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt
         return false;
 
     String aConverted;
-    aConverted.Append( rCC.upper(rTxt.GetChar(nSttPos)) );
-    aConverted.Append( rCC.lower(rTxt.GetChar(nSttPos+1)) );
+    aConverted.Append( rCC.uppercase(rtl::OUString(rTxt.GetChar(nSttPos))) );
+    aConverted.Append( rCC.lowercase(rtl::OUString(rTxt.GetChar(nSttPos+1))) );
 
     for (xub_StrLen i = nSttPos+2; i < nEndPos; ++i)
     {
@@ -1098,7 +1098,7 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const String& rTxt
 
         if ( IsUpperLetter(rCC.getCharacterType(rTxt, i)) )
             // Another uppercase letter.  Convert it.
-            aConverted.Append( rCC.lower(rTxt.GetChar(i)) );
+            aConverted.Append( rCC.lowercase(String(rTxt.GetChar(i))) );
         else
             // This is not an alphabetic letter.  Leave it as-is.
             aConverted.Append(rTxt.GetChar(i));
-- 
cgit