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

17 files changed, 52 insertions, 60 deletions

diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index fb3d3c8c89e0..76342120963f 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -57,11 +57,11 @@ namespace sfx2 { class SvLinkSource;  class LinkManager; }
 
     /** SS fuers Linken von Dokumentteilen  / ?? for linking of parts of documents.
     */
-    virtual bool GetData(const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0;
+    virtual bool GetData(const rtl::OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0;
 
-    virtual bool SetData(const String& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0;
+    virtual bool SetData(const rtl::OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0;
 
-    virtual ::sfx2::SvLinkSource* CreateLinkSource(const String& rItem) = 0;
+    virtual ::sfx2::SvLinkSource* CreateLinkSource(const rtl::OUString& rItem) = 0;
 
     /** Embed all local links (ranges/graphics).
     */
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 0251d46d3527..9fdbb065405a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -801,9 +801,9 @@ public:
     virtual sfx2::LinkManager& GetLinkManager();
     virtual const sfx2::LinkManager& GetLinkManager() const;
     virtual void UpdateLinks(sal_Bool bUI);
-    virtual bool GetData(const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const;
-    virtual bool SetData(const String& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue);
-    virtual ::sfx2::SvLinkSource* CreateLinkSource(const String& rItem);
+    virtual bool GetData(const rtl::OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const;
+    virtual bool SetData(const rtl::OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue);
+    virtual ::sfx2::SvLinkSource* CreateLinkSource(const rtl::OUString& rItem);
     virtual bool EmbedAllLinks();
     virtual void SetLinksUpdated(const bool bNewLinksUpdated);
     virtual bool LinksUpdated() const;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index ede0b0686ad5..2b7464aaf6f8 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -277,7 +277,7 @@ SwCalc::SwCalc( SwDoc& rD )
 
     sCurrSym = pLclData->getCurrSymbol();
     sCurrSym.EraseLeadingChars().EraseTrailingChars();
-    pCharClass->toLower( sCurrSym );
+    sCurrSym  = pCharClass->lowercase( sCurrSym );
 
 static sal_Char const
     sNType0[] = "false",
@@ -484,8 +484,7 @@ String SwCalc::GetStrResult( double nValue, sal_Bool )
 
 SwCalcExp* SwCalc::VarInsert( const String &rStr )
 {
-    String aStr( rStr );
-    pCharClass->toLower( aStr );
+    String aStr = pCharClass->lowercase( rStr );
     return VarLook( aStr, 1 );
 }
 
@@ -499,8 +498,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins )
     aErrExpr.nValue.SetVoidValue(false);
 
     sal_uInt16 ii = 0;
-    String aStr( rStr );
-    pCharClass->toLower( aStr );
+    String aStr = pCharClass->lowercase( rStr );
 
     SwHash* pFnd = Find( aStr, VarTable, TBLSZ, &ii );
 
@@ -577,7 +575,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, sal_uInt16 ins )
            OSL_ENSURE(sColumnName.Len(), "DB-Spaltenname fehlt!");
 
             String sDBNum( SwFieldType::GetTypeStr(TYP_DBSETNUMBERFLD) );
-            pCharClass->toLower(sDBNum);
+            sDBNum = pCharClass->lowercase(sDBNum);
 
             // Hier nochmal initialisieren, da das nicht mehr in docfld
             // fuer Felder != RES_DBFLD geschieht. Z.B. wenn ein Expressionfield
@@ -657,8 +655,7 @@ void SwCalc::VarChange( const String& rStr, double nValue )
 
 void SwCalc::VarChange( const String& rStr, const SwSbxValue& rValue )
 {
-    String aStr( rStr );
-    pCharClass->toLower( aStr );
+    String aStr = pCharClass->lowercase( rStr );
 
     sal_uInt16 nPos = 0;
     SwCalcExp* pFnd = (SwCalcExp*)Find( aStr, VarTable, TBLSZ, &nPos );
@@ -741,9 +738,7 @@ if( !nUseOld )
             String aName( sCommand.Copy( nRealStt, static_cast<xub_StrLen>(aRes.EndPos) - nRealStt ));
             //#101436#: the variable may contain a database name it must not be converted to lower case
             // instead all further comparisons must be done case-insensitive
-            //pCharClass->toLower( aName );
-            String sLowerCaseName(aName);
-            pCharClass->toLower( sLowerCaseName );
+            String sLowerCaseName = pCharClass->lowercase( aName );
             // Currency-Symbol abfangen
             if( sLowerCaseName == sCurrSym )
             {
@@ -1070,7 +1065,7 @@ else
                             --nCommandPos;
 
                         String aStr( sCommand.Copy( nStt, nCommandPos-nStt ));
-                        pCharClass->toLower( aStr );
+                        aStr = pCharClass->lowercase( aStr );
 
 
                         // Currency-Symbol abfangen
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 151840b02c0a..dc512cb38f1f 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -54,10 +54,10 @@ using namespace ::com::sun::star;
 namespace
 {
 
-    static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const String& rName, bool bCaseSensitive)
+    static ::sw::mark::DdeBookmark* lcl_FindDdeBookmark(const IDocumentMarkAccess& rMarkAccess, const rtl::OUString& rName, bool bCaseSensitive)
     {
         //Iterating over all bookmarks, checking DdeBookmarks
-        const ::rtl::OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lower(rName);
+        const ::rtl::OUString sNameLc = bCaseSensitive ? rName : GetAppCharClass().lowercase(rName);
         for(IDocumentMarkAccess::const_iterator_t ppMark = rMarkAccess.getMarksBegin();
             ppMark != rMarkAccess.getMarksEnd();
             ppMark++)
@@ -66,7 +66,7 @@ namespace
             {
                 if (
                     (bCaseSensitive && (pBkmk->GetName() == sNameLc)) ||
-                    (!bCaseSensitive && GetAppCharClass().lower(pBkmk->GetName()) == String(sNameLc))
+                    (!bCaseSensitive && GetAppCharClass().lowercase(pBkmk->GetName()) == sNameLc)
                    )
                 {
                     return pBkmk;
@@ -96,10 +96,10 @@ sal_Bool lcl_FindSection( const SwSectionFmtPtr& rpSectFmt, void* pArgs, bool bC
     {
         String sNm( (bCaseSensitive)
                 ? pSect->GetSectionName()
-                : GetAppCharClass().lower( pSect->GetSectionName() ));
+                : String(GetAppCharClass().lowercase( pSect->GetSectionName() )));
         String sCompare( (bCaseSensitive)
                 ? pItem->m_Item
-                : GetAppCharClass().lower( pItem->m_Item ) );
+                : String(GetAppCharClass().lowercase( pItem->m_Item ) ));
         if( sNm == sCompare )
         {
             // found, so get the data
@@ -131,7 +131,7 @@ sal_Bool lcl_FindSectionCaseInsensitive( const SwSectionFmtPtr& rpSectFmt, void*
 sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
 {
     _FindItem * const pItem( static_cast<_FindItem*>(pArgs) );
-    String sNm( GetAppCharClass().lower( rpTableFmt->GetName() ));
+    String sNm( GetAppCharClass().lowercase( rpTableFmt->GetName() ));
     if (sNm.Equals( pItem->m_Item ))
     {
         SwTable* pTmpTbl;
@@ -154,7 +154,7 @@ sal_Bool lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
 
 
 
-bool SwDoc::GetData( const String& rItem, const String& rMimeType,
+bool SwDoc::GetData( const rtl::OUString& rItem, const String& rMimeType,
                      uno::Any & rValue ) const
 {
     // search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
@@ -166,7 +166,7 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
             return SwServerObject(*pBkmk).GetData(rValue, rMimeType);
 
         // Do we already have the Item?
-        String sItem( bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
+        String sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         _FindItem aPara( sItem );
         ((SwSectionFmts&)*pSectionFmtTbl).ForEach( 0, pSectionFmtTbl->Count(),
                                                     bCaseSensitive ? lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, &aPara );
@@ -180,7 +180,7 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
         bCaseSensitive = false;
     }
 
-    _FindItem aPara( GetAppCharClass().lower( rItem ));
+    _FindItem aPara( GetAppCharClass().lowercase( rItem ));
     ((SwFrmFmts*)pTblFrmFmtTbl)->ForEach( 0, pTblFrmFmtTbl->Count(),
                                             lcl_FindTable, &aPara );
     if( aPara.pTblNd )
@@ -193,7 +193,7 @@ bool SwDoc::GetData( const String& rItem, const String& rMimeType,
 
 
 
-bool SwDoc::SetData( const String& rItem, const String& rMimeType,
+bool SwDoc::SetData( const rtl::OUString& rItem, const String& rMimeType,
                      const uno::Any & rValue )
 {
     // search for bookmarks and sections case senstive at first. If nothing is found then try again case insensitive
@@ -205,7 +205,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
             return SwServerObject(*pBkmk).SetData(rMimeType, rValue);
 
         // Do we already have the Item?
-        String sItem( bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
+        String sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         _FindItem aPara( sItem );
         pSectionFmtTbl->ForEach( 0, pSectionFmtTbl->Count(), bCaseSensitive ? lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, &aPara );
         if( aPara.pSectNd )
@@ -218,7 +218,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
         bCaseSensitive = false;
     }
 
-    String sItem(GetAppCharClass().lower(rItem));
+    String sItem(GetAppCharClass().lowercase(rItem));
     _FindItem aPara( sItem );
     pTblFrmFmtTbl->ForEach( 0, pTblFrmFmtTbl->Count(), lcl_FindTable, &aPara );
     if( aPara.pTblNd )
@@ -231,7 +231,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
 
 
 
-::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const String& rItem)
+::sfx2::SvLinkSource* SwDoc::CreateLinkSource(const rtl::OUString& rItem)
 {
     SwServerObject* pObj = NULL;
 
@@ -252,7 +252,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
         if(pObj)
             return pObj;
 
-        _FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lower(rItem));
+        _FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
         // sections
         ((SwSectionFmts&)*pSectionFmtTbl).ForEach(0, pSectionFmtTbl->Count(), bCaseSensitive ? lcl_FindSectionCaseSensitive : lcl_FindSectionCaseInsensitive, &aPara);
         if(aPara.pSectNd
@@ -270,7 +270,7 @@ bool SwDoc::SetData( const String& rItem, const String& rMimeType,
         bCaseSensitive = false;
     }
 
-    _FindItem aPara( GetAppCharClass().lower(rItem) );
+    _FindItem aPara( GetAppCharClass().lowercase(rItem) );
     // tables
     ((SwFrmFmts*)pTblFrmFmtTbl)->ForEach(0, pTblFrmFmtTbl->Count(), lcl_FindTable, &aPara);
     if(aPara.pTblNd
@@ -306,13 +306,13 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
         sal_Bool bWeiter = sal_False;
         String sName( sItem.Copy( 0, nPos ) );
         String sCmp( sItem.Copy( nPos + 1 ));
-        rCC.toLower( sItem );
+        sItem = rCC.lowercase( sItem );
 
         _FindItem aPara( sName );
 
         if( sCmp.EqualsAscii( pMarkToTable ) )
         {
-            rCC.toLower( sName );
+            sName = rCC.lowercase( sName );
             ((SwFrmFmts*)pTblFrmFmtTbl)->ForEach( 0, pTblFrmFmtTbl->Count(),
                                                     lcl_FindTable, &aPara );
             if( aPara.pTblNd )
@@ -390,7 +390,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
         }
 
         //
-        _FindItem aPara( bCaseSensitive ? sItem : rCC.lower( sItem ) );
+        _FindItem aPara( bCaseSensitive ? sItem : String(rCC.lowercase( sItem )) );
 
         if( pSectionFmtTbl->Count() )
         {
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index c09d28ed318d..8d30248976e8 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1767,7 +1767,7 @@ SvStringsDtor& SwDoc::FindUsedDBs( const SvStringsDtor& rAllDBNames,
     const CharClass& rCC = GetAppCharClass();
     String  sFormel( rFormel);
 #ifndef UNX
-    rCC.toUpper( sFormel );
+    sFormel = rCC.uppercase( sFormel );
 #endif
 
     xub_StrLen nPos;
@@ -2490,7 +2490,7 @@ void SwDocUpdtFld::InsertFldType( const SwFieldType& rType )
     {
         SetFieldsDirty( sal_True );
         // look up and remove from the hash table
-        GetAppCharClass().toLower( sFldName );
+        sFldName = GetAppCharClass().lowercase( sFldName );
         sal_uInt16 n;
 
         SwHash* pFnd = Find( sFldName, GetFldTypeTable(), TBLSZ, &n );
@@ -2521,7 +2521,7 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType& rType )
     {
         SetFieldsDirty( sal_True );
         // look up and remove from the hash table
-        GetAppCharClass().toLower( sFldName );
+        sFldName = GetAppCharClass().lowercase( sFldName );
         sal_uInt16 n;
 
         SwHash* pFnd = Find( sFldName, GetFldTypeTable(), TBLSZ, &n );
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index a8eb17339473..8cb70ce9ba02 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -840,7 +840,7 @@ sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
             sal_Bool bIsUpper =
                 0 != ( i18n::KCharacterType::UPPER &
                                         rCC.getCharacterType( rTxt, nPos ));
-            sal_Unicode cLow = rCC.toLower( rTxt, nPos, 1 ).GetChar(0), cNumTyp;
+            sal_Unicode cLow = rCC.lowercase(rTxt, nPos, 1)[0], cNumTyp;
             int eTmpScan;
 
             // roemische Zeichen sind "mdclxvi". Da man aber eher mal eine
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 47d009b4e316..06f0a7b5a1d0 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -171,7 +171,7 @@ void SwEditShell::RemoveFldType(sal_uInt16 nResId, const String& rStr)
     const sal_uInt16 nSize = pFldTypes->Count();
     const CharClass& rCC = GetAppCharClass();
 
-    String aTmp( rCC.lower( rStr ));
+    String aTmp( rCC.lowercase( rStr ));
 
     for(sal_uInt16 i = 0; i < nSize; ++i)
     {
@@ -179,7 +179,7 @@ void SwEditShell::RemoveFldType(sal_uInt16 nResId, const String& rStr)
         SwFieldType* pFldType = (*pFldTypes)[i];
         if( pFldType->Which() == nResId )
         {
-            if( aTmp.Equals( rCC.lower( pFldType->GetName() ) ))
+            if( aTmp.Equals( rCC.lowercase( pFldType->GetName() ) ))
             {
                 GetDoc()->RemoveFldType(i);
                 return;
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 038c26eb7cc6..d98459809b70 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -612,7 +612,7 @@ String SwEditShell::Calculate()
             String aStr = pTxtNd->GetExpandTxt( nStt, pEnd->nContent.
                                                 GetIndex() - nStt );
 
-            rCC.toLower( aStr );
+            aStr = rCC.lowercase( aStr );
 
             sal_Unicode ch;
             sal_Bool    bValidFlds = sal_False;
diff --git a/sw/source/core/swg/SwXMLBlockListContext.cxx b/sw/source/core/swg/SwXMLBlockListContext.cxx
index 0ab48f681064..f86f30178d3c 100644
--- a/sw/source/core/swg/SwXMLBlockListContext.cxx
+++ b/sw/source/core/swg/SwXMLBlockListContext.cxx
@@ -108,7 +108,7 @@ SwXMLBlockContext::SwXMLBlockContext(
         {
             if ( IsXMLToken ( aLocalName, XML_ABBREVIATED_NAME ) )
             {
-                aShort = rCC.upper(rAttrValue);
+                aShort = rCC.uppercase(rAttrValue);
             }
             else if ( IsXMLToken ( aLocalName, XML_NAME ) )
             {
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index de04be42e9e5..efed9cc8a2c1 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -151,7 +151,7 @@ sal_uInt16 SwImpBlocks::GetCount() const
 // Case Insensitive
 sal_uInt16 SwImpBlocks::GetIndex( const String& rShort ) const
 {
-    String s( GetAppCharClass().upper( rShort ) );
+    String s( GetAppCharClass().uppercase( rShort ) );
     sal_uInt16 nHash = Hash( s );
     for( sal_uInt16 i = 0; i < aNames.Count(); i++ )
     {
@@ -380,7 +380,7 @@ sal_uInt16 SwTextBlocks::Rename( sal_uInt16 n, const String* s, const String* l
         else if( 0 == ( nErr = pImp->OpenFile( sal_False )))
         {
             // Vorher den neuen Eintrag in die Liste setzen!
-            GetAppCharClass().toUpper( aNew );
+            aNew = GetAppCharClass().uppercase( aNew );
              nErr = pImp->Rename( n, aNew, aLong );
             if( !nErr )
             {
@@ -465,8 +465,7 @@ sal_Bool SwTextBlocks::BeginPutDoc( const String& s, const String& l )
         }
         if( bOk )
         {
-            String aNew( s );
-            GetAppCharClass().toUpper( aNew );
+            String aNew = GetAppCharClass().uppercase(s);
             nErr = pImp->BeginPutDoc( aNew, l );
         }
         if( nErr )
@@ -522,8 +521,7 @@ sal_uInt16 SwTextBlocks::PutText( const String& rShort, const String& rName,
         }
         if( bOk )
         {
-            String aNew( rShort );
-            GetAppCharClass().toUpper( aNew );
+            String aNew = GetAppCharClass().uppercase( rShort );
             nErr = pImp->PutText( aNew, rName, rTxt );
             pImp->nCur = (sal_uInt16) -1;
             if( !nErr )
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index bc1fb8b9eea2..13e51e8d6daa 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -115,7 +115,7 @@ SwTOXInternational::~SwTOXInternational()
 
 String SwTOXInternational::ToUpper( const String& rStr, xub_StrLen nPos ) const
 {
-    return pCharClass->toUpper( rStr, nPos, 1 );
+    return pCharClass->uppercase( rStr, nPos, 1 );
 }
 inline sal_Bool SwTOXInternational::IsNumeric( const String& rStr ) const
 {
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index dcd24dafd02d..c16febe8a9b5 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1041,7 +1041,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToke
             rClass.Erase( 0, nPos+1 );
         }
 
-        GetAppCharClass().toLower( rClass );
+        rClass = GetAppCharClass().lowercase( rClass );
         while( STRING_NOTFOUND != rClass.SearchAndReplace( '.', '-' ) )
             ;
         while( STRING_NOTFOUND != rClass.SearchAndReplace( ' ', '-' ) )
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 8b3fb8283260..284fbb5e6439 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -1050,7 +1050,7 @@ SwFltShell& SwFltShell::operator << ( const String& rStr )
 
 void SwFltShell::ConvertUStr( String& rInOut )
 {
-    GetAppCharClass().toUpper( rInOut );
+    rInOut = GetAppCharClass().uppercase( rInOut );
 }
 
 // QuoteString() wandelt CRs abhaengig von nFieldIniFlags in '\n' oder "\0x0d"
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 949ddd9b91fb..e5cf9c8ece7c 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -453,7 +453,7 @@ namespace
 {
     void ConvertUFName( String& rName )
     {
-        GetAppCharClass().toUpper( rName );
+        rName = GetAppCharClass().uppercase( rName );
     }
 }
 
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/ui/cctrl/swlbox.cxx
index 5d2bf53098c2..38f6aabbbc9e 100644
--- a/sw/source/ui/cctrl/swlbox.cxx
+++ b/sw/source/ui/cctrl/swlbox.cxx
@@ -159,9 +159,9 @@ String SwComboBox::GetText() const
     String aTxt( ComboBox::GetText() );
 
     if(nStyle & CBS_LOWER)
-        GetAppCharClass().toLower( aTxt );
+        aTxt = GetAppCharClass().lowercase( aTxt );
     else if( nStyle & CBS_UPPER )
-        GetAppCharClass().toUpper( aTxt );
+        aTxt = GetAppCharClass().uppercase( aTxt );
 
     return aTxt;
 }
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 4246c2cba24e..77ec22116bdb 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -5604,9 +5604,9 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
                         upper++;
                 }
                 if (lower == letters)
-                    aMatch = rCC.lower( rS );
+                    aMatch = rCC.lowercase( rS );
                 else if (upper == letters)
-                    aMatch = rCC.upper( rS );
+                    aMatch = rCC.uppercase( rS );
                 else // mixed case - use what we have
                     aMatch = rS;
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 9119645b29dd..345ffe664b0c 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -866,8 +866,7 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
 IMPL_LINK( SwNewGlosNameDlg, Rename, Button *, EMPTYARG )
 {
     SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent();
-    String sNew = aNewShort.GetText();
-    GetAppCharClass().toUpper(sNew);
+    String sNew = GetAppCharClass().uppercase(aNewShort.GetText());
     if( pDlg->pGlossaryHdl->HasShortName(aNewShort.GetText())
         && sNew != aOldShort.GetText() )
     {