diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-01-06 23:00:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-09 13:28:37 +0000 |
| commit | 45b19123a63f23fe37b11b063d7567bf79ef09aa (patch) | |
| tree | befd8c637ac6fbdf94c05bb80c500fb781dd2bb4 | |
| parent | bcd9122715c7b708a65bee05a90dba3a38624ecb (diff) | |
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
72 files changed, 247 insertions, 311 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 34a453acda29..3ac11152b4ee 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -158,7 +158,7 @@ static long GetDayDiff( const Date& rDate ) return nDiffDays; } -static CharClass& GetCharClass( void ) +static const CharClass& GetCharClass( void ) { static sal_Bool bNeedsInit = sal_True; static ::com::sun::star::lang::Locale aLocale; @@ -1136,9 +1136,9 @@ RTLFUNC(LCase) StarBASIC::Error( SbERR_BAD_ARGUMENT ); else { - CharClass& rCharClass = GetCharClass(); + const CharClass& rCharClass = GetCharClass(); String aStr( rPar.Get(1)->GetString() ); - rCharClass.toLower( aStr ); + aStr = rCharClass.lowercase(aStr); rPar.Get(0)->PutString( aStr ); } } @@ -1681,9 +1681,9 @@ RTLFUNC(UCase) StarBASIC::Error( SbERR_BAD_ARGUMENT ); else { - CharClass& rCharClass = GetCharClass(); + const CharClass& rCharClass = GetCharClass(); String aStr( rPar.Get(1)->GetString() ); - rCharClass.toUpper( aStr ); + aStr = rCharClass.uppercase( aStr ); rPar.Get(0)->PutString( aStr ); } } @@ -3907,8 +3907,8 @@ RTLFUNC(StrConv) sal_Int32 nType = 0; if ( (nConversion & 0x03) == 3 ) // vbProperCase { - CharClass& rCharClass = GetCharClass(); - aOldStr = rCharClass.toTitle( aOldStr.ToLowerAscii(), 0, nOldLen ); + const CharClass& rCharClass = GetCharClass(); + aOldStr = rCharClass.titlecase( aOldStr.ToLowerAscii(), 0, nOldLen ); } else if ( (nConversion & 0x01) == 1 ) // vbUpperCase nType |= ::com::sun::star::i18n::TransliterationModules_LOWERCASE_UPPERCASE; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 541ba2aeef6e..f1731e93d1cd 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1390,7 +1390,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) sal_Bool bShort = pEdt == &aShortED; const String rEntry = pEdt->GetText(); const String rRepString = aReplaceED.GetText(); - String aWordStr( pCharClass->lower( rEntry )); + String aWordStr( pCharClass->lowercase( rEntry )); if(bShort) { @@ -1415,7 +1415,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) } else { - pCharClass->toLower( aTestStr ); + aTestStr = pCharClass->lowercase( aTestStr ); if(aTestStr.Search(aWordStr)==0 && !bTmpSelEntry) { aReplaceTLB.MakeVisible(pEntry); 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)); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index d34e86fe1e8b..a64242e2b2ad 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -477,8 +477,7 @@ xub_StrLen FormulaDlg_Impl::GetFunctionPos(xub_StrLen nPos) xub_StrLen nFuncPos=STRING_NOTFOUND; //@ Testwise sal_Bool bFlag=sal_False; - String aFormString = pMEdit->GetText(); - m_aFormulaHelper.GetCharClass()->toUpper( aFormString ); + String aFormString = m_aFormulaHelper.GetCharClass()->uppercase(pMEdit->GetText()); if ( m_aTokenList.getLength() ) { diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index d2f7365ac27f..132660ff608d 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -753,14 +753,14 @@ sal_uInt16 SAL_CALL Hyphenator::capitalType(const OUString& aTerm, CharClass * p OUString SAL_CALL Hyphenator::makeLowerCase(const OUString& aTerm, CharClass * pCC) { if (pCC) - return pCC->toLower_rtl(aTerm, 0, aTerm.getLength()); + return pCC->lowercase(aTerm); return aTerm; } OUString SAL_CALL Hyphenator::makeUpperCase(const OUString& aTerm, CharClass * pCC) { if (pCC) - return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength()); + return pCC->uppercase(aTerm); return aTerm; } @@ -772,9 +772,9 @@ OUString SAL_CALL Hyphenator::makeInitCap(const OUString& aTerm, CharClass * pCC { OUString bTemp = aTerm.copy(0,1); if (tlen > 1) - return ( pCC->toUpper_rtl(bTemp, 0, 1) + pCC->toLower_rtl(aTerm,1,(tlen-1)) ); + return ( pCC->uppercase(bTemp, 0, 1) + pCC->lowercase(aTerm,1,(tlen-1)) ); - return pCC->toUpper_rtl(bTemp, 0, 1); + return pCC->uppercase(bTemp, 0, 1); } return aTerm; } diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index 8e9bf582d0bb..ae88aead865b 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -643,7 +643,7 @@ sal_uInt16 SAL_CALL Thesaurus::capitalType(const OUString& aTerm, CharClass * pC OUString SAL_CALL Thesaurus::makeLowerCase(const OUString& aTerm, CharClass * pCC) { if (pCC) - return pCC->toLower_rtl(aTerm, 0, aTerm.getLength()); + return pCC->lowercase(aTerm); return aTerm; } @@ -651,7 +651,7 @@ OUString SAL_CALL Thesaurus::makeLowerCase(const OUString& aTerm, CharClass * pC OUString SAL_CALL Thesaurus::makeUpperCase(const OUString& aTerm, CharClass * pCC) { if (pCC) - return pCC->toUpper_rtl(aTerm, 0, aTerm.getLength()); + return pCC->uppercase(aTerm); return aTerm; } @@ -664,11 +664,11 @@ OUString SAL_CALL Thesaurus::makeInitCap(const OUString& aTerm, CharClass * pCC) OUString bTemp = aTerm.copy(0,1); if (tlen > 1) { - return ( pCC->toUpper_rtl(bTemp, 0, 1) - + pCC->toLower_rtl(aTerm,1,(tlen-1)) ); + return ( pCC->uppercase(bTemp, 0, 1) + + pCC->lowercase(aTerm,1,(tlen-1)) ); } - return pCC->toUpper_rtl(bTemp, 0, 1); + return pCC->uppercase(bTemp, 0, 1); } return aTerm; } diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 3e10cf3a9d3d..4927b4e63d20 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -653,7 +653,7 @@ String ToLower( const String &rText, sal_Int16 nLanguage ) CharClass &rCC = lcl_GetCharClass(); rCC.setLocale( CreateLocale( nLanguage ) ); - return rCC.lower( rText ); + return rCC.lowercase( rText ); } @@ -663,7 +663,7 @@ String ToUpper( const String &rText, sal_Int16 nLanguage ) CharClass &rCC = lcl_GetCharClass(); rCC.setLocale( CreateLocale( nLanguage ) ); - return rCC.upper( rText ); + return rCC.uppercase( rText ); } @@ -673,7 +673,7 @@ String ToTitle( const String &rText, sal_Int16 nLanguage ) CharClass &rCC = lcl_GetCharClass(); rCC.setLocale( CreateLocale( nLanguage ) ); - return rCC.toTitle( rText, 0, rText.Len() ); + return rCC.titlecase(rText); } @@ -683,7 +683,7 @@ sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage ) CharClass &rCC = lcl_GetCharClass(); rCC.setLocale( CreateLocale( nLanguage ) ); - return rCC.lower( cChar ).GetChar(0); + return rCC.lowercase( rtl::OUString(cChar) )[0]; } @@ -693,7 +693,7 @@ sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage ) CharClass &rCC = lcl_GetCharClass(); rCC.setLocale( CreateLocale( nLanguage ) ); - return rCC.upper( cChar ).GetChar(0); + return rCC.uppercase( rtl::OUString(cChar) )[0]; } // sorted(!) array of unicode ranges for code points that are exclusively(!) used as numbers 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()); diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 3ee11cc70170..2a2fb434f7c7 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -590,8 +590,7 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) nUpdateMode = pItem->GetValue(); } - String sNmURL( lcl_DDE_RelToAbs( sTopic, sReferer ) ); - aCC.toLower( sNmURL ); + String sNmURL(aCC.lowercase(lcl_DDE_RelToAbs(sTopic, sReferer))); if ( !pShell ) { @@ -609,7 +608,7 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) } - aCC.toLower( sTmp ); + sTmp = aCC.lowercase( sTmp ); if( sTmp == sNmURL ) // we want these { pFndShell = pShell; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 580603c7d284..51d3fecdc630 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -140,7 +140,7 @@ static void CreateFilterArr() //---------------------------------------------------------------- inline String ToUpper_Impl( const String &rStr ) { - return SvtSysLocale().GetCharClass().upper( rStr ); + return SvtSysLocale().GetCharClass().uppercase( rStr ); } //---------------------------------------------------------------- diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index bb163e6f42de..ff73a590f128 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -247,10 +247,9 @@ static String ToUpperUnicode( const String & rStr ) static rtl::OUString aEN(RTL_CONSTASCII_USTRINGPARAM("en")); static rtl::OUString aUS(RTL_CONSTASCII_USTRINGPARAM("US")); static CharClass aCC( com::sun::star::lang::Locale( aEN, aUS, rtl::OUString() ) ); - return aCC.toUpper( rStr, 0, rStr.Len() ); + return aCC.uppercase( rStr ); } - sal_Bool StgEntry::SetName( const String& rName ) { // I don't know the locale, so en_US is hopefully fine 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 ); } } } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index e45b37d7ff11..a4bfa4d9a8ff 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1517,11 +1517,10 @@ void FontStyleBox::Modify() if ( GetEntryPos( aStr ) == COMBOBOX_ENTRY_NOTFOUND ) { - aChrCls.toUpper( aStr ); + aStr = aChrCls.uppercase(aStr); for ( sal_uInt16 i = 0; i < nEntryCount; i++ ) { - XubString aEntryText = GetEntry( i ); - aChrCls.toUpper( aEntryText ); + XubString aEntryText = aChrCls.uppercase(GetEntry(i)); if ( aStr == aEntryText ) { diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 419f419606d2..e4755c45bf32 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -511,7 +511,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri if (!GetCaseSensitive()) // norm the string - m_aCharacterClassficator.toLower_rtl(sCurrentCheck); + sCurrentCheck = m_aCharacterClassficator.lowercase(sCurrentCheck); // jetzt ist der Test einfach ... bFound = aSearchExpression.Matches(sCurrentCheck); @@ -991,7 +991,7 @@ void FmSearchEngine::SearchNextImpl() ::rtl::OUString strSearchExpression(m_strSearchExpression); // brauche ich non-const if (!GetCaseSensitive()) // norm the string - m_aCharacterClassficator.toLower_rtl(strSearchExpression); + strSearchExpression = m_aCharacterClassficator.lowercase(strSearchExpression); if (!m_bRegular && !m_bLevenshtein) { // 'normale' Suche fuehre ich auf jeden Fall ueber WildCards durch, muss aber vorher je nach Modus den ::rtl::OUString anpassen 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() ) { diff --git a/unotools/inc/unotools/charclass.hxx b/unotools/inc/unotools/charclass.hxx index e7253f6c397d..9dafaec767d5 100644 --- a/unotools/inc/unotools/charclass.hxx +++ b/unotools/inc/unotools/charclass.hxx @@ -170,14 +170,22 @@ public: // Wrapper implementations of class CharacterClassification - String toUpper( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; - String toLower( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; - String toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const; + ::rtl::OUString uppercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; + ::rtl::OUString lowercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; + ::rtl::OUString titlecase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; - ::rtl::OUString toUpper_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; - ::rtl::OUString toLower_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const; - // use the postfix because compilers could get confused by the both similar versions - // (me thinks they shouldn't, but in fact MSCV 6 does) + ::rtl::OUString uppercase( const ::rtl::OUString& _rStr ) const + { + return uppercase(_rStr, 0, _rStr.getLength()); + } + ::rtl::OUString lowercase( const ::rtl::OUString& _rStr ) const + { + return lowercase(_rStr, 0, _rStr.getLength()); + } + ::rtl::OUString titlecase( const ::rtl::OUString& _rStr ) const + { + return titlecase(_rStr, 0, _rStr.getLength()); + } sal_Int16 getType( const String& rStr, xub_StrLen nPos ) const; sal_Int16 getCharacterDirection( const String& rStr, xub_StrLen nPos ) const; @@ -215,34 +223,6 @@ public: sal_Bool isNumeric( const String& rStr ) const; sal_Bool isAlphaNumeric( const String& rStr ) const; sal_Bool isLetterNumeric( const String& rStr ) const; - - void toUpper( rtl::OUString& rStr ) const; - void toUpper( String& rStr ) const - { - rStr = toUpper( rStr, 0, rStr.Len() ); - } - void toLower( rtl::OUString& rStr ) const; - void toLower( String& rStr ) const - { - rStr = toLower( rStr, 0, rStr.Len() ); - } - inline String upper( const String& rStr ) const - { - return toUpper( rStr, 0, rStr.Len() ); - } - inline String lower( const String& rStr ) const - { - return toLower( rStr, 0, rStr.Len() ); - } - - const ::rtl::OUString& toUpper_rtl( ::rtl::OUString& _rStr ) const - { - return _rStr = toUpper_rtl( _rStr, 0, _rStr.getLength() ); - } - const ::rtl::OUString& toLower_rtl( ::rtl::OUString& _rStr ) const - { - return _rStr = toLower_rtl( _rStr, 0, _rStr.getLength() ); - } }; #endif // _UNOTOOLS_CHARCLASS_HXX diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index f3c1d416f34a..c169a6614b6a 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -276,40 +276,23 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr ) const } } -void CharClass::toUpper( rtl::OUString& rStr ) const -{ - rStr = toUpper_rtl(rStr, 0, rStr.getLength()); -} - -String CharClass::toUpper( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const -{ - return toUpper_rtl(rStr, nPos, nCount); -} - -String CharClass::toLower( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const -{ - return toLower_rtl(::rtl::OUString(rStr), nPos, nCount); -} - - -String CharClass::toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCount ) const +rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount) const { try { if ( xCC.is() ) return xCC->toTitle( rStr, nPos, nCount, getLocale() ); else - return rStr.Copy( nPos, nCount ); + return rStr.copy( nPos, nCount ); } catch ( const Exception& ) { - DBG_ERRORFILE( "toTitle: Exception caught!" ); - return rStr.Copy( nPos, nCount ); + DBG_ERRORFILE( "titlecase: Exception caught!" ); + return rStr.copy( nPos, nCount ); } } - -::rtl::OUString CharClass::toUpper_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const +::rtl::OUString CharClass::uppercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const { try { @@ -320,13 +303,12 @@ String CharClass::toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCoun } catch ( const Exception& ) { - DBG_ERRORFILE( "toUpper: Exception caught!" ); + DBG_ERRORFILE( "uppercase: Exception caught!" ); return rStr.copy( nPos, nCount ); } } - -::rtl::OUString CharClass::toLower_rtl( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const +::rtl::OUString CharClass::lowercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const { try { @@ -337,12 +319,11 @@ String CharClass::toTitle( const String& rStr, xub_StrLen nPos, xub_StrLen nCoun } catch ( const Exception& ) { - DBG_ERRORFILE( "toLower: Exception caught!" ); + DBG_ERRORFILE( "lowercase: Exception caught!" ); return rStr.copy( nPos, nCount ); } } - sal_Int16 CharClass::getType( const String& rStr, xub_StrLen nPos ) const { try diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 5b72306c73d9..b966b355328a 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -808,7 +808,7 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl( const OUString& rString, pFormatter->GetCompatibilityCurrency( sCurString, sDummy ); pCharClass->setLocale( rLocale ); - String sUpperStr = pCharClass->upper(rString); + String sUpperStr = pCharClass->uppercase(rString); xub_StrLen nPos = lcl_FindSymbol( sUpperStr, sCurString ); if ( nPos != STRING_NOTFOUND ) { |