UniString::ToUpperAscii -> OUString::toAsciiUpperCase

Change-Id: I70f2238021c79a34b97a6bdbcc374d8b1ffb2a31

2 files changed, 10 insertions, 11 deletions

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 6be204bc59fa..4656e2b2c1c0 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3515,19 +3515,18 @@ void ScCompiler::AutoCorrectParsedSymbol()
     }
 }
 
-static inline bool lcl_UpperAsciiOrI18n( String& rUpper, const String& rOrg, FormulaGrammar::Grammar eGrammar )
+static inline bool lcl_UpperAsciiOrI18n( String& rUpper, const OUString& rOrg, FormulaGrammar::Grammar eGrammar )
 {
     if (FormulaGrammar::isODFF( eGrammar ))
     {
         // ODFF has a defined set of English function names, avoid i18n
         // overhead.
-        rUpper = rOrg;
-        rUpper.ToUpperAscii();
+        rUpper = rOrg.toAsciiUpperCase();
         return true;
     }
     else
     {
-        rUpper = ScGlobal::pCharClass->uppercase( rOrg );
+        rUpper = ScGlobal::pCharClass->uppercase(rOrg);
         return false;
     }
 }
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 5fd4de45de96..016124f28bf2 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -580,9 +580,9 @@ static String lcl_GetCharStr( sal_Int32 nNo )
     return aStr;
 }
 
-static String lcl_GetNumStr( sal_Int32 nNo, SvxNumType eType )
+static OUString lcl_GetNumStr(sal_Int32 nNo, SvxNumType eType)
 {
-    String aTmpStr(rtl::OUString('0'));
+    OUString aTmpStr('0');
     if( nNo )
     {
         switch( eType )
@@ -597,11 +597,11 @@ static String lcl_GetNumStr( sal_Int32 nNo, SvxNumType eType )
             if( nNo < 4000 )
                 aTmpStr = SvxNumberFormat::CreateRomanString( nNo, ( eType == SVX_ROMAN_UPPER ) );
             else
-                aTmpStr.Erase();
+                aTmpStr = OUString();
             break;
 
         case SVX_NUMBER_NONE:
-            aTmpStr.Erase();
+            aTmpStr = OUString();
             break;
 
 //      CHAR_SPECIAL:
@@ -609,12 +609,12 @@ static String lcl_GetNumStr( sal_Int32 nNo, SvxNumType eType )
 
 //      case ARABIC:    ist jetzt default
         default:
-            aTmpStr = String::CreateFromInt32( nNo );
+            aTmpStr = OUString::valueOf(nNo);
             break;
         }
 
         if( SVX_CHARS_UPPER_LETTER == eType )
-            aTmpStr.ToUpperAscii();
+            aTmpStr = aTmpStr.toAsciiUpperCase();
     }
     return aTmpStr;
 }
@@ -641,7 +641,7 @@ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
     if (!pFieldData)
         return rtl::OUString("?");
 
-    rtl::OUString aRet;
+    OUString aRet;
     sal_Int32 nClsId = pFieldData->GetClassId();
     switch (nClsId)
     {