[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 9 05:29:26 PST 2012
binfilter/bf_sc/source/core/data/sc_document.cxx | 5 --
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 4 -
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 4 -
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 10 +---
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx | 2
binfilter/bf_sc/source/core/tool/sc_userlist.cxx | 7 +--
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx | 2
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx | 2
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx | 18 ++++----
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 2
binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 6 +-
binfilter/bf_svtools/source/numbers/svt_zforscan.cxx | 40 +++++++++----------
binfilter/bf_svx/source/items/svx_svxfont.cxx | 6 +-
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 18 +++-----
binfilter/bf_sw/source/core/doc/sw_docdde.cxx | 8 +--
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx | 2
17 files changed, 65 insertions(+), 73 deletions(-)
New commits:
commit a4a9f044294ae2afad3ecee138c771a3654add98
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 6 23:09:49 2012 +0000
track changes to CharClass
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index dc9b4ea..1f00d00 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -132,15 +132,14 @@ namespace binfilter {
/*N*/ BOOL ScDocument::GetTable( const String& rName, USHORT& rTab ) const
/*N*/ {
-/*N*/ String aUpperName = rName;
-/*N*/ ScGlobal::pCharClass->toUpper(aUpperName);
+/*N*/ String aUpperName = ScGlobal::pCharClass->uppercase(rName);
/*N*/ String aCompName;
/*N*/
/*N*/ for (USHORT i=0; i<=MAXTAB; i++)
/*N*/ if (pTab[i])
/*N*/ {
/*N*/ pTab[i]->GetName( aCompName );
-/*N*/ ScGlobal::pCharClass->toUpper(aCompName);
+/*N*/ aCompName = ScGlobal::pCharClass->uppercase(aCompName);
/*N*/ if (aUpperName == aCompName)
/*N*/ {
/*N*/ rTab = i;
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index 0fbac52..f409574 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -170,8 +170,8 @@ public:
/*N*/ else
/*N*/ pArgDescs = NULL;
/*N*/
-/*N*/ ScGlobal::pCharClass->toUpper(aUpperName);
-/*N*/ ScGlobal::pCharClass->toUpper(aUpperLocal);
+/*N*/ aUpperName = ScGlobal::pCharClass->uppercase(aUpperName);
+/*N*/ aUpperLocal = ScGlobal::pCharClass->uppercase(aUpperLocal);
/*N*/ }
/*N*/ ScUnoAddInFuncData::~ScUnoAddInFuncData()
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index e67a51f..3653762 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -1467,7 +1467,7 @@ namespace binfilter {
/*N*/ bMayBeFuncName = TRUE; // operators and other opcodes
/*N*/
/*N*/ String aOrg( cSymbol ); // evtl. Dateinamen in IsReference erhalten
-/*N*/ String aUpper( ScGlobal::pCharClass->upper( aOrg ) );
+/*N*/ String aUpper( ScGlobal::pCharClass->uppercase( aOrg ) );
/*N*/ // Spalte DM konnte nicht referiert werden, IsReference vor IsValue
/*N*/ // #42016# italian ARCTAN.2 gab #REF! => IsOpCode vor IsReference
/*N*/ if ( !(bMayBeFuncName && IsOpCode( aUpper ))
@@ -1482,7 +1482,7 @@ namespace binfilter {
/*N*/ SetError( errNoName );
/*N*/ if ( bAutoCorrect )
/*N*/ { // provide single token information and continue
-/*?*/ ScGlobal::pCharClass->toLower( aUpper );
+/*?*/ aUpper = ScGlobal::pCharClass->lowercase( aUpper );
/*?*/ aToken.SetString( aUpper.GetBuffer() );
/*?*/ aToken.NewOpCode( ocBad );
/*?*/ pRawToken = aToken.Clone();
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 5b33047..9eb51bd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1657,8 +1657,7 @@ void ScInterpreter::ScTrim()
void ScInterpreter::ScUpper()
{
- String aString = GetString();
- ScGlobal::pCharClass->toUpper(aString);
+ String aString = ScGlobal::pCharClass->uppercase(GetString());
PushString(aString);
}
@@ -1672,8 +1671,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();
@@ -1697,8 +1696,7 @@ void ScInterpreter::ScPropper()
void ScInterpreter::ScLower()
{
- String aString( GetString() );
- ScGlobal::pCharClass->toLower(aString);
+ String aString = ScGlobal::pCharClass->lowercase(GetString());
PushString(aString);
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
index cace9a1..171c602 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
@@ -1428,7 +1428,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
/*N*/ USHORT nIndex;
/*N*/ BYTE nParamCount = GetByte();
/*N*/ String aUnoName;
-/*N*/ String aFuncName( ScGlobal::pCharClass->upper( pCur->GetExternal() ) );
+/*N*/ String aFuncName( ScGlobal::pCharClass->uppercase( pCur->GetExternal() ) );
/*N*/ if (ScGlobal::GetFuncCollection()->SearchFunc(aFuncName, nIndex))
/*N*/ {
/*?*/ FuncData* pFuncData = (FuncData*)ScGlobal::GetFuncCollection()->At(nIndex);
diff --git a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
index fc6581f..6ad9d67 100644
--- a/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_userlist.cxx
@@ -56,8 +56,8 @@ namespace binfilter {
/*N*/ pUpperSub = new String[nTokenCount];
/*N*/ for (USHORT i=0; i<nTokenCount; i++)
/*N*/ {
-/*N*/ pUpperSub[i] = pSubStrings[i] = aStr.GetToken((xub_StrLen)i,cSep);
-/*N*/ ScGlobal::pCharClass->toUpper(pUpperSub[i]);
+/*N*/ pSubStrings[i] = aStr.GetToken((xub_StrLen)i,cSep);
+/*N*/ pUpperSub[i] = ScGlobal::pCharClass->uppercase(pSubStrings[i]);
/*N*/ }
/*N*/ }
/*N*/ else
@@ -98,8 +98,7 @@ namespace binfilter {
/*N*/ return TRUE;
/*N*/ }
/*N*/
-/*N*/ String aUpStr = rSubStr;
-/*N*/ ScGlobal::pCharClass->toUpper(aUpStr);
+/*N*/ String aUpStr = ScGlobal::pCharClass->uppercase(rSubStr);
/*N*/ for (i=0; i<nTokenCount; i++)
/*N*/ if (aUpStr == pUpperSub[i])
/*N*/ {
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
index c38d41e..aab90f9 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
@@ -309,7 +309,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFunctionAccess )
BOOL lcl_AddFunctionToken( ScTokenArray& rArray, const ::rtl::OUString& rName )
{
// 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/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
index a877c0a..e1b07d0 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
@@ -78,7 +78,7 @@ struct FlagMapping_Impl
//----------------------------------------------------------------
/*N*/ inline String ToUpper_Impl( const String &rStr )
/*N*/ {
-/*N*/ return SvtSysLocale().GetCharClass().upper( rStr );
+/*N*/ return SvtSysLocale().GetCharClass().uppercase( rStr );
/*N*/ }
//----------------------------------------------------------------
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
index 1c7adbf..17a38bb 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforfind.cxx
@@ -624,7 +624,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 ) )
@@ -639,7 +639,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();
@@ -675,13 +675,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();
@@ -2373,8 +2373,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 [] pUpperDayText;
delete [] pUpperAbbrevDayText;
@@ -2384,8 +2384,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;
}
@@ -2449,7 +2449,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/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index f055f90..40180a4 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -1432,7 +1432,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/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
index 7b5c958..bbe290e 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx
@@ -1083,8 +1083,8 @@ short SvNumberformat::ImpNextSymbol(String& rString,
{
static const String aNatNum( RTL_CONSTASCII_USTRINGPARAM( "NATNUM" ) );
static 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() );
@@ -1145,7 +1145,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 == pKeywords[NF_KEY_H].GetChar(0) || // H
cUpper == pKeywords[NF_KEY_MI].GetChar(0) || // M
cUpper == pKeywords[NF_KEY_S].GetChar(0) ) // S
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforscan.cxx b/binfilter/bf_svtools/source/numbers/svt_zforscan.cxx
index 6bfc301..fe4ed43 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforscan.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforscan.cxx
@@ -140,7 +140,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() )
{
@@ -150,7 +150,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() )
{
@@ -170,7 +170,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;
}
@@ -199,7 +199,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
i18n::NumberFormatCode aFormat = aNumberFormatCode.getFormatCode( NF_NUMBER_STANDARD );
sNameStandardFormat = 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" ) );
@@ -427,7 +427,7 @@ void ImpSvNumberformatScan::ChangeStandardPrec(short nPrec)
Color* ImpSvNumberformatScan::GetColor(String& sStr)
{
- String sString = pFormatter->GetCharClass()->upper(sStr);
+ String sString = pFormatter->GetCharClass()->uppercase(sStr);
const String* pKeyword = GetKeywords();
size_t i = 0;
while (i < NF_MAX_DEFAULT_COLORS &&
@@ -497,7 +497,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 String* pKeyword = GetKeywords();
// #77026# for the Xcl perverts: the GENERAL keyword is recognized anywhere
if ( sString.Search( pKeyword[NF_KEY_GENERAL] ) == 0 )
@@ -618,7 +618,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
!(nPos > 1 && rStr.GetChar( nPos-2 ) == '[') )
{
String aTest( rStr.Copy( nPos-1, sCurString.Len() ) );
- pChrCls->toUpper( aTest );
+ aTest = pChrCls->uppercase( aTest );
if ( aTest == sCurString )
{
sSymbol = rStr.Copy( --nPos, sCurString.Len() );
@@ -716,7 +716,7 @@ short ImpSvNumberformatScan::Next_Symbol( const String& rStr,
sCurString.Search( sKeyword[nTmpType] ) == 0 )
{
String aTest( rStr.Copy( nPos-1, sCurString.Len() ) );
- pChrCls->toUpper( aTest );
+ aTest = pChrCls->uppercase( aTest );
if ( aTest == sCurString )
bCurrency = TRUE;
}
@@ -856,7 +856,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)
{
@@ -1412,7 +1412,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
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);
@@ -2224,7 +2224,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
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 )
@@ -2522,8 +2522,8 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
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] );
USHORT j = i + 1;
@@ -2533,7 +2533,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
{
aTmp += sStrArray[j++];
}
- if ( pChrCls->upper( aTmp ) == sOldCurString )
+ if ( pChrCls->uppercase( aTmp ) == sOldCurString )
{
sStrArray[i++] = aTmp;
for ( ; i<j; i++ )
@@ -2629,7 +2629,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
{ // 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 );
@@ -2639,9 +2639,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
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 )
@@ -2662,7 +2662,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
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 );
@@ -2672,9 +2672,9 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
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/binfilter/bf_svx/source/items/svx_svxfont.cxx b/binfilter/bf_svx/source/items/svx_svxfont.cxx
index 5cc2814..328c236 100644
--- a/binfilter/bf_svx/source/items/svx_svxfont.cxx
+++ b/binfilter/bf_svx/source/items/svx_svxfont.cxx
@@ -96,13 +96,13 @@ namespace binfilter {
/*N*/ case SVX_CASEMAP_KAPITAELCHEN:
/*N*/ case SVX_CASEMAP_VERSALIEN:
/*N*/ {
-/*N*/ aCharClass.toUpper( aTxt );
+/*N*/ aTxt = aCharClass.uppercase( aTxt );
/*N*/ break;
/*N*/ }
/*N*/
/*N*/ case SVX_CASEMAP_GEMEINE:
/*N*/ {
-/*?*/ aCharClass.toLower( aTxt );
+/*?*/ aTxt = aCharClass.lowercase( aTxt );
/*?*/ break;
/*?*/ }
/*?*/ case SVX_CASEMAP_TITEL:
@@ -121,7 +121,7 @@ namespace binfilter {
/*?*/ if( bBlank )
/*?*/ {
/*?*/ String aTemp( aTxt.GetChar( i ) );
-/*?*/ aCharClass.toUpper( aTemp );
+/*?*/ aTemp = aCharClass.uppercase( aTemp );
/*?*/ aTxt.Replace( i, 1, aTemp );
/*?*/ }
/*?*/ bBlank = FALSE;
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index 7f3f5df..cc945d3 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -273,7 +273,7 @@ static int
/*N*/
/*N*/ sCurrSym = pLclData->getCurrSymbol();
/*N*/ sCurrSym.EraseLeadingChars().EraseTrailingChars();
-/*N*/ pCharClass->toLower( sCurrSym );
+/*N*/ sCurrSym = pCharClass->lowercase( sCurrSym );
/*N*/
/*N*/ static sal_Char const
/*N*/ sNType0[] = "false",
@@ -477,8 +477,7 @@ static int
/*N*/ SwCalcExp* SwCalc::VarInsert( const String &rStr )
/*N*/ {
-/*N*/ String aStr( rStr );
-/*N*/ pCharClass->toLower( aStr );
+/*N*/ String aStr(pCharClass->lowercase(rStr));
/*N*/ return VarLook( aStr, 1 );
/*N*/ }
@@ -490,10 +489,9 @@ static int
/*N*/ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
/*N*/ {
/*N*/ USHORT ii = 0;
-/*N*/ String aStr( rStr );
-/*N*/ pCharClass->toLower( aStr );
+/*N*/ String aStr(pCharClass->lowercase(rStr));
/*N*/
-/*N*/ SwHash* pFnd = Find( aStr, VarTable, TBLSZ, &ii );
+/*N*/ SwHash* pFnd = Find( aStr, VarTable, TBLSZ, &ii );
/*N*/
/*N*/ if( !pFnd )
/*N*/ {
@@ -606,8 +604,7 @@ static int
/*?*/ void SwCalc::VarChange( const String& rStr, const SwSbxValue& rValue )
/*?*/ {
-/*?*/ String aStr( rStr );
-/*?*/ pCharClass->toLower( aStr );
+/*?*/ String aStr(pCharClass->lowercase(rStr));
/*?*/
/*?*/ USHORT nPos = 0;
/*?*/ SwCalcExp* pFnd = (SwCalcExp*)Find( aStr, VarTable, TBLSZ, &nPos );
@@ -680,9 +677,8 @@ static int
/*M*/ String aName( sCommand.Copy( nRealStt, aRes.EndPos - nRealStt ));
/*M*/ //#101436#: the variable may contain a database name it must not be converted to lower case
/*M*/ // instead all further comparisons must be done case-insensitive
-/*M*/ //pCharClass->toLower( aName );
-/*M*/ String sLowerCaseName(aName);
-/*M*/ pCharClass->toLower( sLowerCaseName );
+/*M*/ //pCharClass->lowercase( aName );
+/*M*/ String sLowerCaseName(pCharClass->lowercase(aName));
/*M*/ // Currency-Symbol abfangen
/*M*/ if( sLowerCaseName == sCurrSym )
/*M*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdde.cxx b/binfilter/bf_sw/source/core/doc/sw_docdde.cxx
index d7998f6..be8f4f6 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdde.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdde.cxx
@@ -81,7 +81,7 @@ struct _FindItem
/*N*/ SwSection* pSect = rpSectFmt->GetSection();
/*N*/ if( pSect )
/*N*/ {
-/*N*/ String sNm( GetAppCharClass().lower( pSect->GetName() ));
+/*N*/ String sNm( GetAppCharClass().lowercase( pSect->GetName() ));
/*N*/ if( sNm.Equals( ((_FindItem*)pArgs)->rItem ))
/*N*/ {
/*N*/ // gefunden, als erfrage die Daten
@@ -102,7 +102,7 @@ struct _FindItem
/*N*/ BOOL lcl_FindTable( const SwFrmFmtPtr& rpTableFmt, void* pArgs )
/*N*/ {
-/*N*/ String sNm( GetAppCharClass().lower( rpTableFmt->GetName() ));
+/*N*/ String sNm( GetAppCharClass().lowercase( rpTableFmt->GetName() ));
/*N*/ if( sNm.Equals( ((_FindItem*)pArgs)->rItem ))
/*N*/ {
/*?*/ SwTable* pTmpTbl;
@@ -128,7 +128,7 @@ struct _FindItem
/*N*/ ::binfilter::SvLinkSource* SwDoc::CreateLinkSource( const String& rItem )
/*N*/ {
/*N*/ // haben wir ueberhaupt das Item vorraetig?
-/*N*/ String sItem( GetAppCharClass().lower( rItem ));
+/*N*/ String sItem( GetAppCharClass().lowercase( rItem ));
/*N*/ _FindItem aPara( sItem );
/*N*/
/*N*/ SwServerObject* pObj;
@@ -180,7 +180,7 @@ struct _FindItem
/*N*/ const CharClass& rCC = GetAppCharClass();
/*N*/
/*N*/ // alte "Mechanik"
-/*N*/ rCC.toLower( sItem );
+/*N*/ sItem = rCC.lowercase( sItem );
/*N*/ _FindItem aPara( sItem );
/*N*/ if( pBookmarkTbl->Count() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index ab4dae1..89371ba 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -1465,7 +1465,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
/*N*/ {
/*N*/ SetFieldsDirty( TRUE );
/*N*/ // suchen und aus der HashTabelle entfernen
-/*N*/ GetAppCharClass().toLower( sFldName );
+/*N*/ sFldName = GetAppCharClass().lowercase(sFldName);
/*N*/ USHORT n;
/*N*/
/*N*/ SwHash* pFnd = Find( sFldName, GetFldTypeTable(), TBLSZ, &n );
diff --git a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
index 8b5fcc3..471e896 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx
@@ -800,7 +800,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 )
{
More information about the Libreoffice-commits
mailing list