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

35 files changed, 93 insertions, 104 deletions

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 0b466c0db17e..fd6bd286d725 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -58,13 +58,12 @@ using ::std::set;
 
 // STATIC DATA -----------------------------------------------------------
 
-namespace {
-
-void lcl_toUpper(OUString& rStr)
+namespace
 {
-    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<sal_uInt16>(rStr.getLength()));
-}
-
+    void lcl_uppercase(OUString& rStr)
+    {
+        rStr = ScGlobal::pCharClass->uppercase(rStr.trim());
+    }
 }
 
 ScDocumentIterator::ScDocumentIterator( ScDocument* pDocument,
@@ -825,9 +824,9 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM
                 // Equality check first.
 
                 OUString aMatStr = rMat.GetString(nField, nRow);
-                lcl_toUpper(aMatStr);
+                lcl_uppercase(aMatStr);
                 OUString aQueryStr = rEntry.GetQueryItem().maString;
-                lcl_toUpper(aQueryStr);
+                lcl_uppercase(aQueryStr);
                 bool bDone = false;
                 switch (rEntry.eOp)
                 {
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8f31478bbdc4..dbc4cecc5087 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -218,8 +218,7 @@ bool ScDocument::GetCodeName( SCTAB nTab, rtl::OUString& rName ) const
 
 bool ScDocument::GetTable( const rtl::OUString& rName, SCTAB& rTab ) const
 {
-    rtl::OUString aUpperName = rName;
-    ScGlobal::pCharClass->toUpper(aUpperName);
+    rtl::OUString aUpperName = ScGlobal::pCharClass->uppercase(rName);
 
     for (SCTAB i=0; i< static_cast<SCTAB>(maTabs.size()); i++)
         if (maTabs[i])
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 539fd882e7b2..046c159f2e23 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -246,7 +246,7 @@ const ScRange& ScSheetSourceDesc::GetSourceRange() const
             if (!pRangeName)
                 break;
 
-            OUString aUpper = ScGlobal::pCharClass->upper(maRangeName);
+            OUString aUpper = ScGlobal::pCharClass->uppercase(maRangeName);
             const ScRangeData* pData = pRangeName->findByUpperName(aUpper);
             if (!pData)
                 break;
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 30e6926bd8ae..f9dbef0014ce 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -499,8 +499,7 @@ void ScStyleSheetPool::CreateStandardStyles()
 
 ScStyleSheet* ScStyleSheetPool::FindCaseIns( const String& rName, SfxStyleFamily eFam )
 {
-    String aUpSearch = rName;
-    ScGlobal::pCharClass->toUpper(aUpSearch);
+    String aUpSearch = ScGlobal::pCharClass->uppercase(rName);
 
     sal_uInt32 nCount = aStyles.size();
     for (sal_uInt32 n=0; n<nCount; n++)
@@ -508,8 +507,7 @@ ScStyleSheet* ScStyleSheetPool::FindCaseIns( const String& rName, SfxStyleFamily
         SfxStyleSheetBase* pStyle = aStyles[n].get();
         if ( pStyle->GetFamily() == eFam )
         {
-            String aUpName = pStyle->GetName();
-            ScGlobal::pCharClass->toUpper(aUpName);
+            String aUpName = ScGlobal::pCharClass->uppercase(pStyle->GetName());
             if (aUpName == aUpSearch)
                 return (ScStyleSheet*)pStyle;
         }
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 93285a294c1c..4493a718578f 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -366,7 +366,7 @@ void ScTable::SetName( const rtl::OUString& rNewName )
 const rtl::OUString& ScTable::GetUpperName() const
 {
     if (aUpperName.isEmpty() && !aName.isEmpty())
-        aUpperName = ScGlobal::pCharClass->upper(aName);
+        aUpperName = ScGlobal::pCharClass->uppercase(aName);
     return aUpperName;
 }
 
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 853785bcfd2f..2b5fbedc5357 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3013,8 +3013,7 @@ bool ScTable::RefVisible(ScFormulaCell* pCell)
 void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, rtl::OUString& rStr)
 {
     GetInputString(nCol, nRow, rStr);
-    rStr = rStr.trim();
-    ScGlobal::pCharClass->toUpper(rStr);
+    rStr = ScGlobal::pCharClass->uppercase(rStr.trim());
 }
 
 
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index d98552bfd1a0..5525888f5ca1 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -881,7 +881,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
             {
                 GetString( nGroupCol[i], nStartRow, aSubString );
                 if ( bIgnoreCase )
-                    *pCompString[i] = ScGlobal::pCharClass->upper( aSubString );
+                    *pCompString[i] = ScGlobal::pCharClass->uppercase( aSubString );
                 else
                     *pCompString[i] = aSubString;
             }                                                   // aSubString bleibt auf dem letzten stehen
@@ -903,7 +903,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
                         {
                             GetString( nGroupCol[i], nRow, aString );
                             if (bIgnoreCase)
-                                ScGlobal::pCharClass->toUpper( aString );
+                                aString = ScGlobal::pCharClass->uppercase(aString);
                             //  wenn sortiert, ist "leer" eine eigene Gruppe
                             //  sonst sind leere Zellen unten erlaubt
                             bChanged = ( ( !aString.isEmpty() || rParam.bDoSort ) &&
@@ -997,7 +997,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
                         {
                             GetString( nGroupCol[i], nRow, aSubString );
                             if ( bIgnoreCase )
-                                *pCompString[i] = ScGlobal::pCharClass->upper( aSubString );
+                                *pCompString[i] = ScGlobal::pCharClass->uppercase( aSubString );
                             else
                                 *pCompString[i] = aSubString;
                         }
@@ -1928,7 +1928,7 @@ bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow
             while (nCol <= nCol2)
             {
                 GetInputString( nCol, nRow, aCellStr );
-                ScGlobal::pCharClass->toUpper( aCellStr );
+                aCellStr = ScGlobal::pCharClass->uppercase(aCellStr);
                 if (!aCellStr.isEmpty())
                 {
                     if (nIndex < nNewEntries)
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 505a65020340..3e6d5236cca3 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -106,8 +106,8 @@ ScUnoAddInFuncData::ScUnoAddInFuncData( const String& rNam, const String& rLoc,
     else
         pArgDescs = NULL;
 
-    ScGlobal::pCharClass->toUpper(aUpperName);
-    ScGlobal::pCharClass->toUpper(aUpperLocal);
+    aUpperName = ScGlobal::pCharClass->uppercase(aUpperName);
+    aUpperLocal = ScGlobal::pCharClass->uppercase(aUpperLocal);
 }
 
 ScUnoAddInFuncData::~ScUnoAddInFuncData()
@@ -670,8 +670,7 @@ sal_Bool ScUnoAddInCollection::GetCalcName( const String& rExcelName, String& rR
     if (!bInitialized)
         Initialize();
 
-    String aUpperCmp = rExcelName;
-    ScGlobal::pCharClass->toUpper(aUpperCmp);
+    rtl::OUString aUpperCmp = ScGlobal::pCharClass->uppercase(rExcelName);
 
     for (long i=0; i<nFuncCount; i++)
     {
@@ -684,7 +683,7 @@ sal_Bool ScUnoAddInCollection::GetCalcName( const String& rExcelName, String& rR
             {
                 const sheet::LocalizedName* pArray = rSequence.getConstArray();
                 for ( long nName=0; nName<nSeqLen; nName++)
-                    if ( ScGlobal::pCharClass->upper( pArray[nName].Name ) == aUpperCmp )
+                    if ( ScGlobal::pCharClass->uppercase( pArray[nName].Name ) == aUpperCmp )
                     {
                         //! store upper case for comparing?
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 67dc2de860bd..c7dc18ac660d 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -188,7 +188,7 @@ void ScCompiler::DeInit()
 bool ScCompiler::IsEnglishSymbol( const String& rName )
 {
     // function names are always case-insensitive
-    String aUpper( ScGlobal::pCharClass->upper( rName ) );
+    String aUpper( ScGlobal::pCharClass->uppercase( rName ) );
 
     // 1. built-in function name
     OpCode eOp = ScCompiler::GetEnglishOpCode( aUpper );
@@ -3533,7 +3533,7 @@ inline bool lcl_UpperAsciiOrI18n( String& rUpper, const String& rOrg, FormulaGra
     }
     else
     {
-        rUpper = ScGlobal::pCharClass->upper( rOrg );
+        rUpper = ScGlobal::pCharClass->uppercase( rOrg );
         return false;
     }
 }
@@ -3673,7 +3673,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
 
         // User defined names and such do need i18n upper also in ODF.
         if (bAsciiUpper)
-            aUpper = ScGlobal::pCharClass->upper( aOrg );
+            aUpper = ScGlobal::pCharClass->uppercase( aOrg );
 
         if (IsNamedRange( aUpper ))
             return true;
@@ -3702,7 +3702,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
     // Provide single token information and continue. Do not set an error, that
     // would prematurely end compilation. Simple unknown names are handled by
     // the interpreter.
-    ScGlobal::pCharClass->toLower( aUpper );
+    aUpper = ScGlobal::pCharClass->lowercase( aUpper );
     ScRawToken aToken;
     aToken.SetString( aUpper.GetBuffer() );
     aToken.NewOpCode( ocBad );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 3cc4146ca1a3..288fbacb40d9 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -82,7 +82,7 @@ ScDBData::ScDBData( const ::rtl::OUString& rName,
     bAutoFilter (false),
     bModified   (false)
 {
-    ScGlobal::pCharClass->toUpper(aUpper);
+    aUpper = ScGlobal::pCharClass->uppercase(aUpper);
 }
 
 ScDBData::ScDBData( const ScDBData& rData ) :
@@ -137,7 +137,7 @@ ScDBData::ScDBData( const ::rtl::OUString& rName, const ScDBData& rData ) :
     bAutoFilter         (rData.bAutoFilter),
     bModified           (rData.bModified)
 {
-    ScGlobal::pCharClass->toUpper(aUpper);
+    aUpper = ScGlobal::pCharClass->uppercase(aUpper);
 }
 
 ScDBData& ScDBData::operator= (const ScDBData& rData)
diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
index a5d582a75821..e13f239d5572 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -46,9 +46,9 @@ using ::std::vector;
 
 namespace {
 
-void lcl_toUpper(OUString& rStr)
+void lcl_uppercase(OUString& rStr)
 {
-    rStr = ScGlobal::pCharClass->toUpper(rStr.trim(), 0, static_cast<xub_StrLen>(rStr.getLength()));
+    rStr = ScGlobal::pCharClass->uppercase(rStr.trim());
 }
 
 bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, const ScDBRangeBase* pQueryRef)
@@ -83,7 +83,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
         {
             // For all entries after the first one, check the and/or connector in the first column.
             aCellStr = pQueryRef->getString(0, nRow);
-            lcl_toUpper(aCellStr);
+            lcl_uppercase(aCellStr);
             if ( aCellStr.equals(ScGlobal::GetRscString(STR_TABLE_UND)) )
             {
                 rEntry.eConnect = SC_AND;
@@ -114,7 +114,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef,
         {
             // equality, non-equality operator in the 3rd column.
             aCellStr = pQueryRef->getString(2, nRow);
-            lcl_toUpper(aCellStr);
+            lcl_uppercase(aCellStr);
             const sal_Unicode* p = aCellStr.getStr();
             if (p[0] == sal_Unicode('<'))
             {
@@ -192,7 +192,7 @@ bool lcl_createExcelQuery(
             while (nCol < nCols)
             {
                 aCellStr = pQueryRef->getString(nCol, nRow);
-                ScGlobal::pCharClass->toUpper( aCellStr );
+                aCellStr = ScGlobal::pCharClass->uppercase( aCellStr );
                 if (aCellStr.Len() > 0)
                 {
                     if (nIndex < nNewEntries)
@@ -347,7 +347,7 @@ SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr)
     const ScAddress& s = maRange.aStart;
     const ScAddress& e = maRange.aEnd;
     OUString aUpper = rStr;
-    lcl_toUpper(aUpper);
+    lcl_uppercase(aUpper);
 
     SCCOL nDBCol1 = s.Col();
     SCROW nDBRow1 = s.Row();
@@ -365,7 +365,7 @@ SCCOL ScDBInternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr)
         sal_uInt16 nErr = getDoc()->GetStringForFormula( aLook, aCellStr );
         if (pErr)
             *pErr = nErr;
-        lcl_toUpper(aCellStr);
+        lcl_uppercase(aCellStr);
         bFound = ScGlobal::GetpTransliteration()->isEqual(aCellStr, aUpper);
         if (!bFound)
             aLook.IncCol();
@@ -461,11 +461,11 @@ SCCOL ScDBExternalRange::findFieldColumn(const OUString& rStr, sal_uInt16* pErr)
         pErr = 0;
 
     OUString aUpper = rStr;
-    lcl_toUpper(aUpper);
+    lcl_uppercase(aUpper);
     for (SCCOL i = 0; i < mnCols; ++i)
     {
         OUString aUpperVal = mpMatrix->GetString(i, 0);
-        lcl_toUpper(aUpperVal);
+        lcl_uppercase(aUpperVal);
         if (aUpper.equals(aUpperVal))
             return i;
     }
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f54d2a0dbf2f..1ee820405f5e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2909,8 +2909,7 @@ void ScInterpreter::ScTrim()
 void ScInterpreter::ScUpper()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTrim" );
-    String aString = GetString();
-    ScGlobal::pCharClass->toUpper(aString);
+    String aString = ScGlobal::pCharClass->uppercase(GetString());
     PushString(aString);
 }
 
@@ -2925,8 +2924,8 @@ void ScInterpreter::ScPropper()
     // (would crash now that the empty string is const)
     if ( nLen > 0 )
     {
-        String aUpr( ScGlobal::pCharClass->upper( aStr ) );
-        String aLwr( ScGlobal::pCharClass->lower( aStr ) );
+        String aUpr( ScGlobal::pCharClass->uppercase( aStr ) );
+        String aLwr( ScGlobal::pCharClass->lowercase( aStr ) );
         register sal_Unicode* pStr = aStr.GetBufferAccess();
         const sal_Unicode* pUpr = aUpr.GetBuffer();
         const sal_Unicode* pLwr = aLwr.GetBuffer();
@@ -2951,8 +2950,7 @@ void ScInterpreter::ScPropper()
 void ScInterpreter::ScLower()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLower" );
-    String aString( GetString() );
-    ScGlobal::pCharClass->toLower(aString);
+    String aString = ScGlobal::pCharClass->lowercase(GetString());
     PushString(aString);
 }
 
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 429150ecbcf6..b329ccbfac3d 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2489,7 +2489,7 @@ void ScInterpreter::ScExternal()
     sal_uInt16 nIndex;
     sal_uInt8 nParamCount = GetByte();
     String aUnoName;
-    String aFuncName( ScGlobal::pCharClass->upper( pCur->GetExternal() ) );
+    String aFuncName( ScGlobal::pCharClass->uppercase( pCur->GetExternal() ) );
     if (ScGlobal::GetFuncCollection()->SearchFunc(aFuncName, nIndex))
     {
         FuncData* pFuncData = (FuncData*)ScGlobal::GetFuncCollection()->At(nIndex);
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 410b2ff8a3a8..7add078052c4 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -326,7 +326,7 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken
     // similar to ScInterpreter::ScExternal()
     sal_uInt16 nIndex;
     String aUnoName;
-    String aFuncName( ScGlobal::pCharClass->upper( pToken->GetExternal()));
+    String aFuncName( ScGlobal::pCharClass->uppercase( pToken->GetExternal()));
     if ( ScGlobal::GetFuncCollection()->SearchFunc( aFuncName, nIndex) )
     {
         FuncData* pFuncData = (FuncData*)ScGlobal::GetFuncCollection()->At(
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 8ebcc7655485..0766f00635bf 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -68,7 +68,7 @@ ScRangeData::ScRangeData( ScDocument* pDok,
                           RangeType nType,
                           const FormulaGrammar::Grammar eGrammar ) :
                 aName       ( rName ),
-                aUpperName  ( ScGlobal::pCharClass->upper( rName ) ),
+                aUpperName  ( ScGlobal::pCharClass->uppercase( rName ) ),
                 pCode       ( NULL ),
                 aPos        ( rAddress ),
                 eType       ( nType ),
@@ -99,7 +99,7 @@ ScRangeData::ScRangeData( ScDocument* pDok,
                           const ScAddress& rAddress,
                           RangeType nType ) :
                 aName       ( rName ),
-                aUpperName  ( ScGlobal::pCharClass->upper( rName ) ),
+                aUpperName  ( ScGlobal::pCharClass->uppercase( rName ) ),
                 pCode       ( new ScTokenArray( rArr ) ),
                 aPos        ( rAddress ),
                 eType       ( nType ),
@@ -128,7 +128,7 @@ ScRangeData::ScRangeData( ScDocument* pDok,
                           const rtl::OUString& rName,
                           const ScAddress& rTarget ) :
                 aName       ( rName ),
-                aUpperName  ( ScGlobal::pCharClass->upper( rName ) ),
+                aUpperName  ( ScGlobal::pCharClass->uppercase( rName ) ),
                 pCode       ( new ScTokenArray() ),
                 aPos        ( rTarget ),
                 eType       ( RT_NAME ),
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 82d9dcb9c06f..edb85aa0922f 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -305,9 +305,9 @@ sal_Bool ScRangeUtil::MakeRangeFromName (
         ScRangeName* pRangeNames = pDoc->GetRangeName( nTable );
         ScRangeData* pData = NULL;
         if ( pRangeNames )
-            pData = pRangeNames->findByUpperName(ScGlobal::pCharClass->upper(aName));
+            pData = pRangeNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
         if (!pData)
-            pData = pDoc->GetRangeName()->findByUpperName(ScGlobal::pCharClass->upper(aName));
+            pData = pDoc->GetRangeName()->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
         if (pData)
         {
             String       aStrArea;
@@ -1019,7 +1019,7 @@ ScRangeData* ScRangeStringConverter::GetRangeDataFromString(const rtl::OUString&
 {
     ScRangeName* pLocalRangeName = pDoc->GetRangeName(nTab);
     ScRangeData* pData = NULL;
-    rtl::OUString aUpperName = ScGlobal::pCharClass->upper(rString);
+    rtl::OUString aUpperName = ScGlobal::pCharClass->uppercase(rString);
     if(pLocalRangeName)
     {
         pData = pLocalRangeName->findByUpperName(aUpperName);
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index f09423b0851d..4a97af052d21 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -85,8 +85,7 @@ void ScUserListData::InitTokens()
             if (nLen)
             {
                 OUString aSub(p0, nLen);
-                String aUpStr = aSub;
-                ScGlobal::pCharClass->toUpper(aUpStr);
+                String aUpStr = ScGlobal::pCharClass->uppercase(aSub);
                 maSubStrings.push_back(new SubStr(aSub, aUpStr));
             }
             bFirst = true;
@@ -96,8 +95,7 @@ void ScUserListData::InitTokens()
     if (nLen)
     {
         OUString aSub(p0, nLen);
-        String aUpStr = aSub;
-        ScGlobal::pCharClass->toUpper(aUpStr);
+        String aUpStr = ScGlobal::pCharClass->uppercase(aSub);
         maSubStrings.push_back(new SubStr(aSub, aUpStr));
     }
 }
@@ -141,8 +139,7 @@ bool ScUserListData::GetSubIndex(const OUString& rSubStr, sal_uInt16& rIndex) co
     }
 
     // When that fails, do a case insensitive search.
-    String aTmp = rSubStr;
-    ScGlobal::pCharClass->toUpper(aTmp);
+    String aTmp = ScGlobal::pCharClass->uppercase(rSubStr);
     OUString aUpStr = aTmp;
     itr = ::std::find_if(
         maSubStrings.begin(), maSubStrings.end(), FindByName(aUpStr, true));
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index b060be8df861..34b13ae091ba 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -207,7 +207,7 @@ void ScHTMLImport::WriteToDocument(
         if (!pTable->GetTableName().isEmpty())
         {
             String aName( ScfTools::GetNameFromHTMLName( pTable->GetTableName() ) );
-            if (!mpDoc->GetRangeName()->findByUpperName(ScGlobal::pCharClass->upper(aName)))
+            if (!mpDoc->GetRangeName()->findByUpperName(ScGlobal::pCharClass->uppercase(aName)))
                 InsertRangeName( mpDoc, aName, aNewRange );
         }
     }
@@ -237,7 +237,7 @@ String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrig
             while( bLoop )
             {
                 aToken = ScfTools::GetNameFromHTMLIndex( nIndex++ );
-                const ScRangeData* pRangeData = pRangeNames->findByUpperName(ScGlobal::pCharClass->upper(aToken));
+                const ScRangeData* pRangeData = pRangeNames->findByUpperName(ScGlobal::pCharClass->uppercase(aToken));
                 if (pRangeData)
                 {
                     ScRange aRange;
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 2c09688530cb..2fb048431c06 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -418,7 +418,7 @@ void ScEEImport::WriteToDocument( sal_Bool bSizeColsRows, double nOutputFactor,
                 bHasGraphics |= GraphicSize( nCol, nRow, nTab, pE );
             if ( pE->pName )
             {   // Anchor Name => RangeName
-                if (!pRangeNames->findByUpperName(ScGlobal::pCharClass->upper(*pE->pName)))
+                if (!pRangeNames->findByUpperName(ScGlobal::pCharClass->uppercase(*pE->pName)))
                 {
                     ScRangeData* pData = new ScRangeData( mpDoc, *pE->pName,
                         ScAddress( nCol, nRow, nTab ) );
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1793fae56d80..f6404a717c8b 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2363,7 +2363,7 @@ void ScPosWnd::DoEnter()
                 {
                     ScRangeName* pNames = pDoc->GetRangeName();
                     ScRange aSelection;
-                    if ( pNames && !pNames->findByUpperName(ScGlobal::pCharClass->upper(aText)) &&
+                    if ( pNames && !pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aText)) &&
                             (pViewData->GetSimpleArea( aSelection ) == SC_MARK_SIMPLE) )
                     {
                         ScRangeName aNewRanges( *pNames );
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index 4c0bf59d38eb..961b979d81a5 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -1487,7 +1487,7 @@ void ScDPLayoutDlg::UpdateSrcRange()
         ScRangeName* pRangeName = pDoc->GetRangeName();
         if (pRangeName)
         {
-            OUString aUpper = ScGlobal::pCharClass->upper(aSrcStr);
+            OUString aUpper = ScGlobal::pCharClass->uppercase(aSrcStr);
             const ScRangeData* pData = pRangeName->findByUpperName(aUpper);
             if (pData)
             {
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 554e61152117..18e163d6b915 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -215,7 +215,7 @@ bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const Strin
     ScRangeName* pNames = pSrcDoc->GetRangeName();
     if (pNames)         // benannte Bereiche
     {
-        const ScRangeData* p = pNames->findByUpperName(ScGlobal::pCharClass->upper(rAreaName));
+        const ScRangeData* p = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(rAreaName));
         if (p && p->IsValidReference(rRange))
             bFound = true;
     }
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 598c1ea55637..dd3df9559c96 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4573,7 +4573,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
             ScRange( nX1, nY1, nTab, nX2, nY2, nTab ).Format( aContent, SCR_ABS_3D, pDoc );
 
             bool bInsert = false;
-            ScRangeData* pOld = rList.findByUpperName(ScGlobal::pCharClass->upper(aName));
+            ScRangeData* pOld = rList.findByUpperName(ScGlobal::pCharClass->uppercase(aName));
             if (pOld)
             {
                 String aOldStr;
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index f1f1305ecddb..2760a394123e 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2079,7 +2079,7 @@ long ScDocShell::DdeSetData( const String& rItem,
     ScRangeName* pRange = aDocument.GetRangeName();
     if( pRange )
     {
-        const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->upper(aPos));
+        const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->uppercase(aPos));
         if (pData)
         {
             if( pData->HasType( RT_REFAREA )
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index bddc951160c6..7931074490ab 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -91,7 +91,7 @@ class TabNameSearchPredicate : public unary_function<ScExternalRefCache::TableNa
 {
 public:
     explicit TabNameSearchPredicate(const OUString& rSearchName) :
-        maSearchName(ScGlobal::pCharClass->upper(rSearchName))
+        maSearchName(ScGlobal::pCharClass->uppercase(rSearchName))
     {
     }
 
@@ -518,7 +518,7 @@ const OUString* ScExternalRefCache::getRealTableName(sal_uInt16 nFileId, const O
 
     const DocItem& rDoc = itrDoc->second;
     TableNameIndexMap::const_iterator itrTabId = rDoc.maTableNameIndex.find(
-        ScGlobal::pCharClass->upper(rTabName));
+        ScGlobal::pCharClass->uppercase(rTabName));
     if (itrTabId == rDoc.maTableNameIndex.end())
     {
         // the specified table is not in cache.
@@ -539,7 +539,7 @@ const OUString* ScExternalRefCache::getRealRangeName(sal_uInt16 nFileId, const O
 
     const DocItem& rDoc = itrDoc->second;
     NamePairMap::const_iterator itr = rDoc.maRealRangeNameMap.find(
-        ScGlobal::pCharClass->upper(rRangeName));
+        ScGlobal::pCharClass->uppercase(rRangeName));
     if (itr == rDoc.maRealRangeNameMap.end())
         // range name not found.
         return NULL;
@@ -559,7 +559,7 @@ ScExternalRefCache::TokenRef ScExternalRefCache::getCellData(
 
     const DocItem& rDoc = itrDoc->second;
     TableNameIndexMap::const_iterator itrTabId = rDoc.maTableNameIndex.find(
-        ScGlobal::pCharClass->upper(rTabName));
+        ScGlobal::pCharClass->uppercase(rTabName));
     if (itrTabId == rDoc.maTableNameIndex.end())
     {
         // the specified table is not in cache.
@@ -587,7 +587,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefCache::getCellRangeData(
     DocItem& rDoc = itrDoc->second;
 
     TableNameIndexMap::iterator itrTabId = rDoc.maTableNameIndex.find(
-        ScGlobal::pCharClass->upper(rTabName));
+        ScGlobal::pCharClass->uppercase(rTabName));
     if (itrTabId == rDoc.maTableNameIndex.end())
         // the specified table is not in cache.
         return TokenArrayRef();
@@ -695,7 +695,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefCache::getRangeNameTokens(sal_uIn
 
     RangeNameMap& rMap = pDoc->maRangeNames;
     RangeNameMap::const_iterator itr = rMap.find(
-        ScGlobal::pCharClass->upper(rName));
+        ScGlobal::pCharClass->uppercase(rName));
     if (itr == rMap.end())
         return TokenArrayRef();
 
@@ -708,7 +708,7 @@ void ScExternalRefCache::setRangeNameTokens(sal_uInt16 nFileId, const OUString&
     if (!pDoc)
         return;
 
-    String aUpperName = ScGlobal::pCharClass->upper(rName);
+    String aUpperName = ScGlobal::pCharClass->uppercase(rName);
     RangeNameMap& rMap = pDoc->maRangeNames;
     rMap.insert(RangeNameMap::value_type(aUpperName, pArray));
     pDoc->maRealRangeNameMap.insert(NamePairMap::value_type(aUpperName, rName));
@@ -729,7 +729,7 @@ void ScExternalRefCache::setCellData(sal_uInt16 nFileId, const OUString& rTabNam
 
     // See if the table by this name already exists.
     TableNameIndexMap::iterator itrTabName = rDoc.maTableNameIndex.find(
-        ScGlobal::pCharClass->upper(rTabName));
+        ScGlobal::pCharClass->uppercase(rTabName));
     if (itrTabName == rDoc.maTableNameIndex.end())
         // Table not found.  Maybe the table name or the file id is wrong ???
         return;
@@ -760,7 +760,7 @@ void ScExternalRefCache::setCellRangeData(sal_uInt16 nFileId, const ScRange& rRa
     // Now, find the table position of the first table to cache.
     const String& rFirstTabName = rData.front().maTableName;
     TableNameIndexMap::iterator itrTabName = rDoc.maTableNameIndex.find(
-        ScGlobal::pCharClass->upper(rFirstTabName));
+        ScGlobal::pCharClass->uppercase(rFirstTabName));
     if (itrTabName == rDoc.maTableNameIndex.end())
     {
         // table index not found.
@@ -844,7 +844,7 @@ void ScExternalRefCache::initializeDoc(sal_uInt16 nFileId, const vector<OUString
     for (vector<OUString>::const_iterator itr = rTabNames.begin(), itrEnd = rTabNames.end();
           itr != itrEnd; ++itr)
     {
-        TableName aNameItem(ScGlobal::pCharClass->upper(*itr), *itr);
+        TableName aNameItem(ScGlobal::pCharClass->uppercase(*itr), *itr);
         aNewTabNames.push_back(aNameItem);
     }
     pDoc->maTableNames.swap(aNewTabNames);
@@ -950,7 +950,7 @@ bool ScExternalRefCache::hasCacheTable(sal_uInt16 nFileId, const OUString& rTabN
     if (!pDoc)
         return false;
 
-    String aUpperName = ScGlobal::pCharClass->upper(rTabName);
+    String aUpperName = ScGlobal::pCharClass->uppercase(rTabName);
     vector<TableName>::const_iterator itrBeg = pDoc->maTableNames.begin(), itrEnd = pDoc->maTableNames.end();
     vector<TableName>::const_iterator itr = ::std::find_if(
         itrBeg, itrEnd, TabNameSearchPredicate(aUpperName));
@@ -986,7 +986,7 @@ bool ScExternalRefCache::setCacheTableReferenced( sal_uInt16 nFileId, const OUSt
     if (pDoc)
     {
         size_t nIndex = 0;
-        String aTabNameUpper = ScGlobal::pCharClass->upper( rTabName);
+        String aTabNameUpper = ScGlobal::pCharClass->uppercase( rTabName);
         if (lcl_getTableDataIndex( pDoc->maTableNameIndex, aTabNameUpper, nIndex))
         {
             size_t nStop = ::std::min( nIndex + nSheets, pDoc->maTables.size());
@@ -1171,7 +1171,7 @@ ScExternalRefCache::TableTypeRef ScExternalRefCache::getCacheTable(sal_uInt16 nF
     DocItem& rDoc = *pDoc;
 
     size_t nIndex;
-    String aTabNameUpper = ScGlobal::pCharClass->upper(rTabName);
+    String aTabNameUpper = ScGlobal::pCharClass->uppercase(rTabName);
     if (lcl_getTableDataIndex(rDoc.maTableNameIndex, aTabNameUpper, nIndex))
     {
         // specified table found.
@@ -2006,7 +2006,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getDoubleRefTokensFromSr
     vector<ScExternalRefCache::SingleRangeData> aCacheData;
     aCacheData.reserve(nTabSpan+1);
     aCacheData.push_back(ScExternalRefCache::SingleRangeData());
-    aCacheData.back().maTableName = ScGlobal::pCharClass->upper(rTabName);
+    aCacheData.back().maTableName = ScGlobal::pCharClass->uppercase(rTabName);
 
     for (SCTAB i = 1; i < nTabSpan + 1; ++i)
     {
@@ -2016,7 +2016,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getDoubleRefTokensFromSr
             break;
 
         aCacheData.push_back(ScExternalRefCache::SingleRangeData());
-        aCacheData.back().maTableName = ScGlobal::pCharClass->upper(aTabName);
+        aCacheData.back().maTableName = ScGlobal::pCharClass->uppercase(aTabName);
     }
 
     aRange.aStart.SetTab(nTab1);
@@ -2032,7 +2032,7 @@ ScExternalRefCache::TokenArrayRef ScExternalRefManager::getRangeNameTokensFromSr
     sal_uInt16 nFileId, const ScDocument* pSrcDoc, OUString& rName)
 {
     ScRangeName* pExtNames = pSrcDoc->GetRangeName();
-    String aUpperName = ScGlobal::pCharClass->upper(rName);
+    String aUpperName = ScGlobal::pCharClass->uppercase(rName);
     const ScRangeData* pRangeData = pExtNames->findByUpperName(aUpperName);
     if (!pRangeData)
         return ScExternalRefCache::TokenArrayRef();
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index c5389776f675..f53ded435f8e 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -169,7 +169,7 @@ ScImportExport::ScImportExport( ScDocument* p, const String& rPos )
     ScRangeName* pRange = pDoc->GetRangeName();
     if( pRange )
     {
-        const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->upper(aPos));
+        const ScRangeData* pData = pRange->findByUpperName(ScGlobal::pCharClass->uppercase(aPos));
         if (pData)
         {
             if( pData->HasType( RT_REFAREA )
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index cdcf3f095563..c9041ea526fa 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -52,7 +52,7 @@ sal_Bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const Strin
         ScRangeName* pNames = pDoc->GetRangeName();
         if (pNames)
         {
-            const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->upper(rName));
+            const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(rName));
             if (pData)
             {
                 if ( pData->IsValidReference( rRange ) )
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 19de63123d1d..1fad2a6ad6ad 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -174,7 +174,7 @@ bool ScNameDefDlg::IsNameValid()
         maBtnAdd.Disable();
         return false;
     }
-    else if (pRangeName->findByUpperName(ScGlobal::pCharClass->upper(aName)))
+    else if (pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(aName)))
     {
         maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         maFtInfo.SetText(maErrNameInUse);
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index fe2453f3b808..e6362feb283a 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -292,7 +292,7 @@ bool ScNameDlg::IsNameValid()
         maFtInfo.SetText(maErrInvalidNameStr);
         return false;
     }
-    else if (pRangeName && pRangeName->findByUpperName(ScGlobal::pCharClass->upper(aName)))
+    else if (pRangeName && pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(aName)))
     {
         maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         maFtInfo.SetText(maErrNameInUse);
@@ -345,7 +345,7 @@ void ScNameDlg::CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData )
 void ScNameDlg::ShowOptions(const ScRangeNameLine& rLine)
 {
     ScRangeName* pRangeName = GetRangeName(rLine.aScope);
-    ScRangeData* pData = pRangeName->findByUpperName(ScGlobal::pCharClass->upper(rLine.aName));
+    ScRangeData* pData = pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(rLine.aName));
     if (pData)
     {
         UpdateChecks(pData);
@@ -380,7 +380,7 @@ void ScNameDlg::RemovePushed()
     for (std::vector<ScRangeNameLine>::iterator itr = maEntries.begin(); itr != maEntries.end(); ++itr)
     {
         ScRangeName* pRangeName = GetRangeName(itr->aScope);
-        ScRangeData* pData = pRangeName->findByUpperName(ScGlobal::pCharClass->upper(itr->aName));
+        ScRangeData* pData = pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(itr->aName));
         OSL_ENSURE(pData, "table and model should be in sync");
         // be safe and check for possible problems
         if (pData)
@@ -423,7 +423,7 @@ void ScNameDlg::NameModified()
     rtl::OUString aNewScope = maLbScope.GetSelectEntry();
 
     ScRangeName* pOldRangeName = GetRangeName( aOldScope );
-    ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->upper(aOldName) );
+    ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->uppercase(aOldName) );
     ScRangeName* pNewRangeName = GetRangeName( aNewScope );
     OSL_ENSURE(pData, "model and table should be in sync");
     // be safe and check for range data
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index b9164d36b8c5..2bc51896ca87 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -157,7 +157,7 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi
     else
         pRangeName = mrRangeMap.find(rLine.aScope)->second;
 
-    return pRangeName->findByUpperName(ScGlobal::pCharClass->upper(rLine.aName));
+    return pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(rLine.aName));
 }
 
 
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index e3a49dd67153..c80ca02a7e45 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1016,7 +1016,7 @@ bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rName, ScRa
         ScRangeName* pList = pDoc->GetRangeName();
         if (pList)
         {
-            const ScRangeData* p = pList->findByUpperName(ScGlobal::pCharClass->upper(rName));
+            const ScRangeData* p = pList->findByUpperName(ScGlobal::pCharClass->uppercase(rName));
             if (p && p->IsValidReference(rRange))
                 bFound = true;
         }
@@ -1026,7 +1026,7 @@ bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const String& rName, ScRa
         ScDBCollection* pList = pDoc->GetDBCollection();
         if (pList)
         {
-            const ScDBData* p = pList->getNamedDBs().findByUpperName(ScGlobal::pCharClass->upper(rName));
+            const ScDBData* p = pList->getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(rName));
             if (p)
             {
                 SCTAB nTab;
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 722f2629fc3e..4297d7255746 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -355,7 +355,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess )
 sal_Bool lcl_AddFunctionToken( ScTokenArray& rArray, const rtl::OUString& rName,const ScCompiler& rCompiler )
 {
     // function names are always case-insensitive
-    String aUpper( ScGlobal::pCharClass->upper( rName ) );
+    String aUpper( ScGlobal::pCharClass->uppercase( rName ) );
 
     // same options as in ScCompiler::IsOpCode:
     // 1. built-in function name
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 60f30251a8ce..efb00e67252b 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -135,7 +135,7 @@ ScRangeData* ScNamedRangeObj::GetRangeData_Impl()
             pNames = pDocShell->GetDocument()->GetRangeName();
         if (pNames)
         {
-            pRet = pNames->findByUpperName(ScGlobal::pCharClass->upper(aName));
+            pRet = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
             if (pRet)
                 pRet->ValidateTabRefs();        // adjust relative tab refs to valid tables
         }
@@ -178,7 +178,7 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const ScTokenArray* p
     if (!pNames)
         return;
 
-    const ScRangeData* pOld = pNames->findByUpperName(ScGlobal::pCharClass->upper(aName));
+    const ScRangeData* pOld = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
     if (!pOld)
         return;
 
@@ -554,7 +554,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const rtl::OUString& aName,
     {
         ScDocument* pDoc = pDocShell->GetDocument();
         ScRangeName* pNames = GetRangeName_Impl();
-        if (pNames && !pNames->findByUpperName(ScGlobal::pCharClass->upper(aName)))
+        if (pNames && !pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName)))
         {
             ScRangeName* pNewRanges = new ScRangeName( *pNames );
             // GRAM_PODF_A1 for API compatibility.
@@ -615,7 +615,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const rtl::OUString& aName )
         ScRangeName* pNames = GetRangeName_Impl();
         if (pNames)
         {
-            const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->upper(aName));
+            const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
             if (pData && lcl_UserVisibleName(*pData))
             {
                 ScRangeName* pNewRanges = new ScRangeName(*pNames);
@@ -777,7 +777,7 @@ sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const rtl::OUString& aName )
         ScRangeName* pNames = GetRangeName_Impl();
         if (pNames)
         {
-            const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->upper(aName));
+            const ScRangeData* pData = pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName));
             if (pData && lcl_UserVisibleName(*pData))
                 return sal_True;
         }
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 21500db44d7d..114ac2e63c5a 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1185,7 +1185,7 @@ bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, S
                 ScRangeName* pRangeName = pDoc->GetRangeName(nCurTab);
                 if (pRangeName)
                 {
-                    bLocalName = pRangeName->findByUpperName(ScGlobal::pCharClass->upper(sAddress)) != NULL;
+                    bLocalName = pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(sAddress)) != NULL;
                     // TODO: Handle local names correctly.
                     (void)bLocalName;
                 }
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 9bd0d9e52f54..38d799962e3f 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2926,7 +2926,7 @@ sal_Bool ScViewFunc::InsertName( const String& rName, const String& rSymbol,
         pDoc->CompileNameFormula( sal_True );   // CreateFormulaString
 
         // input available yet? Then remove beforehand (=change)
-        ScRangeData* pData = pList->findByUpperName(ScGlobal::pCharClass->upper(rName));
+        ScRangeData* pData = pList->findByUpperName(ScGlobal::pCharClass->uppercase(rName));
         if (pData)
         {                                   // take old Index
             pNewEntry->SetIndex(pData->GetIndex());