summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-08-21 15:07:31 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-08-21 15:10:35 +0200
commit64b993e046f23baaacaff1572b7d2a816588b5ef (patch)
tree237dce36a1d4787d168a0520839f6aab22500487 /svl
parent75f41baab6ce75786a91fe461835ee16a23ec18e (diff)
finish deprecation of O(U)String::valueOf()
Compiler plugin to replace with matching number(), boolean() or OUString ctor, ran it, few manual tweaks, mark as really deprecated. Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
Diffstat (limited to 'svl')
-rw-r--r--svl/source/items/ptitem.cxx2
-rw-r--r--svl/source/items/stylepool.cxx2
-rw-r--r--svl/source/items/szitem.cxx2
-rw-r--r--svl/source/numbers/zforlist.cxx22
-rw-r--r--svl/source/numbers/zformat.cxx14
-rw-r--r--svl/source/numbers/zforscan.cxx2
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx10
7 files changed, 27 insertions, 27 deletions
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index b62b88054c69..956a20330b39 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -75,7 +75,7 @@ SfxItemPresentation SfxPointItem::GetPresentation
) const
{
DBG_CHKTHIS(SfxPointItem, 0);
- rText = OUString::valueOf(aVal.X()) + ", " + OUString::valueOf(aVal.Y()) + ", ";
+ rText = OUString::number(aVal.X()) + ", " + OUString::number(aVal.Y()) + ", ";
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index c1577a4c7b3f..aa933a126a89 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -348,7 +348,7 @@ namespace {
OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet )
{
- return OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
+ return OUString::number( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
}
// class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet.
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index cf7249ab6603..78f1ada2059e 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -71,7 +71,7 @@ SfxItemPresentation SfxSizeItem::GetPresentation
) const
{
DBG_CHKTHIS(SfxSizeItem, 0);
- rText = OUString::valueOf(aVal.Width()) + ", " + OUString::valueOf(aVal.Height()) + ", ";
+ rText = OUString::number(aVal.Width()) + ", " + OUString::number(aVal.Height()) + ", ";
return SFX_ITEM_PRESENTATION_NAMELESS;
}
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 0442261e35fb..6c731e7dabd4 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -975,7 +975,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge, bool bNoAdditio
{
if ( i != j && xSeq[i].formatIndex == nIdx )
{
- aDupes.append(OUString::valueOf( i ));
+ aDupes.append(OUString::number( i ));
aDupes.append("(");
aDupes.append(xSeq[i].formatKey);
aDupes.append( ") ");
@@ -985,9 +985,9 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge, bool bNoAdditio
{
OUStringBuffer aMsg(aDupes.getLength() + xSeq[j].formatKey.getLength() + 100);
aMsg.append("XML locale data FormatElement formatindex dupe: ");
- aMsg.append(OUString::valueOf((sal_Int32)nIdx));
+ aMsg.append(OUString::number(nIdx));
aMsg.append("\nFormatElements: ");
- aMsg.append(OUString::valueOf( j ));
+ aMsg.append(OUString::number( j ));
aMsg.append("(");
aMsg.append( xSeq[j].formatKey );
aMsg.append( ") ");
@@ -1801,7 +1801,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
rCode.Index != NF_CURRENCY_1000DEC2_CCC )
{
OUString aMsg(OUString("SvNumberFormatter::ImpInsertFormat: no [$...] on currency format code, index ") +
- OUString::valueOf( sal_Int32(rCode.Index)) +
+ OUString::number( rCode.Index) +
OUString(":\n") +
rCode.Code);
LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -1821,7 +1821,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
if (LocaleDataWrapper::areChecksEnabled())
{
OUString aMsg( OUString("SvNumberFormatter::ImpInsertFormat: bad format code, index " ) +
- OUString::valueOf( sal_Int32(rCode.Index) ) +
+ OUString::number( rCode.Index ) +
OUString("\n") +
rCode.Code);
LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -1851,7 +1851,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
default:
{
OUString aMsg("SvNumberFormatter::ImpInsertFormat: dup format code, index ");
- aMsg += OUString::valueOf( sal_Int32(rCode.Index) );
+ aMsg += OUString::number( rCode.Index );
aMsg += "\n";
aMsg += rCode.Code;
LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -1866,7 +1866,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
if (LocaleDataWrapper::areChecksEnabled())
{
OUString aMsg( "SvNumberFormatter::ImpInsertFormat: too many format codes, index ");
- aMsg += OUString::valueOf( sal_Int32(rCode.Index) );
+ aMsg += OUString::number( rCode.Index );
aMsg += "\n";
aMsg += rCode.Code;
LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -1880,9 +1880,9 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
if (LocaleDataWrapper::areChecksEnabled())
{
OUString aMsg( "ImpInsertFormat: can't insert number format key pos: ");
- aMsg += OUString::valueOf( sal_Int32( nPos ) );
+ aMsg += OUString::number( nPos );
aMsg += ", code index ";
- aMsg += OUString::valueOf( sal_Int32(rCode.Index) );
+ aMsg += OUString::number( rCode.Index );
aMsg += "\n";
aMsg += rCode.Code;
LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg));
@@ -2027,7 +2027,7 @@ sal_Int32 SvNumberFormatter::ImpGetFormatCodeIndex(
|| nTabOff == NF_CURRENCY_1000DEC2_CCC))
{ // currency entries with decimals might not exist, e.g. Italian Lira
OUString aMsg( "SvNumberFormatter::ImpGetFormatCodeIndex: not found: " );
- aMsg += OUString::valueOf( sal_Int32( nTabOff ) );
+ aMsg += OUString::number( nTabOff );
LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo(aMsg));
}
if ( nLen )
@@ -3966,7 +3966,7 @@ OUString NfCurrencyEntry::BuildSymbolString(bool bBank,
if ( !bWithoutExtension && eLanguage != LANGUAGE_DONTKNOW && eLanguage != LANGUAGE_SYSTEM )
{
sal_Int32 nLang = static_cast<sal_Int32>(eLanguage);
- aBuf.append('-').append( OUString::valueOf(nLang, 16).toAsciiUpperCase());
+ aBuf.append('-').append( OUString::number(nLang, 16).toAsciiUpperCase());
}
}
aBuf.append(']');
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index abaf36b068b5..909a1dbbda43 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -884,7 +884,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
sStr = "NatNum";
//! eSymbolType is negative
sal_uInt8 nNum = (sal_uInt8)(0 - (eSymbolType - BRACKET_SYMBOLTYPE_NATNUM0));
- sStr += OUString::valueOf( (sal_Int32)nNum );
+ sStr += OUString::number( nNum );
NumFor[nIndex].SetNatNumNum( nNum, false );
}
break;
@@ -1035,7 +1035,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
// e.g. Thai T speciality
if (pSc->GetNatNumModifier() && !NumFor[nIndex].GetNatNum().IsSet())
{
- sStr = "[NatNum" + OUString::valueOf( sal_Int32(pSc->GetNatNumModifier())) + "]" + sStr;
+ sStr = "[NatNum" + OUString::number( pSc->GetNatNumModifier()) + "]" + sStr;
NumFor[nIndex].SetNatNumNum( pSc->GetNatNumModifier(), false );
}
// #i53826# #i42727# For the Thai T speciality we need
@@ -1055,7 +1055,7 @@ SvNumberformat::SvNumberformat(OUString& rString,
((eLanguage = MsLangId::getRealLanguage( eLan)) == LANGUAGE_THAI) &&
NumFor[nIndex].GetNatNum().GetLang() == LANGUAGE_DONTKNOW)
{
- sStr = "[$-" + OUString::valueOf( sal_Int32(eLanguage), 16 ).toAsciiUpperCase() + "]" + sStr;
+ sStr = "[$-" + OUString::number( eLanguage, 16 ).toAsciiUpperCase() + "]" + sStr;
NumFor[nIndex].SetNatNumLang( eLanguage);
}
sBuff.remove(nPosOld, nPos - nPosOld);
@@ -2691,7 +2691,7 @@ bool SvNumberformat::ImpGetScientificOutput(double fNumber,
{
nExpSign = 1;
}
- ExpStr = OUString::valueOf( nExp );
+ ExpStr = OUString::number( nExp );
}
}
@@ -5278,12 +5278,12 @@ OUString SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
}
else
{
- aStr = OUString::valueOf( nVal );
+ aStr = OUString::number( nVal );
}
}
else
{
- OUString aValStr( OUString::valueOf( nVal ) );
+ OUString aValStr( OUString::number( nVal ) );
if ( aValStr.getLength() >= nMinDigits )
{
aStr = aValStr;
@@ -5302,7 +5302,7 @@ OUString SvNumberformat::ImpGetNatNumString( const SvNumberNatNum& rNum,
}
else
{
- aStr = OUString::valueOf( nVal );
+ aStr = OUString::number( nVal );
}
return impTransliterate(aStr, rNum);
}
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ce019296ed68..eea82fb4ec53 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1669,7 +1669,7 @@ sal_Int32 ImpSvNumberformatScan::FinalScan( OUString& rString )
{
sDiv += sStrArray[j++];
}
- if (OUString::valueOf(sDiv.toInt32()) == sDiv)
+ if (OUString::number(sDiv.toInt32()) == sDiv)
{
// Found a Divisor
while (i < j)
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index ddef32e9c020..cc739fb4657a 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -61,12 +61,12 @@ static OUString createIndex( vector< OUString > lines )
{
if (comphelper::string::isalnumAscii(*pLine))
{
- aResult += OString::valueOf( *pLine );
+ aResult += OString( *pLine );
}
else
{
aResult += OString("_");
- aResult += OString::valueOf( (sal_Int32) *pLine, 16 );
+ aResult += OString::number( *pLine, 16 );
}
pLine++;
@@ -95,7 +95,7 @@ static vector< OUString > getInfoFromInd( OUString aInd )
while( *pLine && !( pLine[0] == '_' && pLine[1] == '_' ))
if( *pLine != '_' )
{
- newItem += OUString::valueOf( (sal_Unicode) *pLine );
+ newItem += OUString( (sal_Unicode) *pLine );
pLine++;
}
else
@@ -112,10 +112,10 @@ static vector< OUString > getInfoFromInd( OUString aInd )
return aResult;
}
- aNum += OUString::valueOf( (sal_Unicode) pLine[i] );
+ aNum += OUString( (sal_Unicode) pLine[i] );
}
- newItem += OUString::valueOf( (sal_Unicode) aNum.toUInt32( 16 ) );
+ newItem += OUString( (sal_Unicode) aNum.toUInt32( 16 ) );
pLine += 3;
}