diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:07:31 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-08-21 15:10:35 +0200 |
| commit | 64b993e046f23baaacaff1572b7d2a816588b5ef (patch) | |
| tree | 237dce36a1d4787d168a0520839f6aab22500487 /oox/source/dump | |
| parent | 75f41baab6ce75786a91fe461835ee16a23ec18e (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 'oox/source/dump')
| -rw-r--r-- | oox/source/dump/dumperbase.cxx | 6 | ||||
| -rw-r--r-- | oox/source/dump/oledumper.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 6f1c744fc1bb..cd2920411c2d 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -246,7 +246,7 @@ void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt32 nData, sal_Int32 void StringHelper::appendDec( OUStringBuffer& rStr, sal_Int32 nData, sal_Int32 nWidth, sal_Unicode cFill ) { - appendString( rStr, OUString::valueOf( nData ), nWidth, cFill ); + appendString( rStr, OUString::number( nData ), nWidth, cFill ); } void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32 nWidth, sal_Unicode cFill ) @@ -256,14 +256,14 @@ void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32 will be written separately. */ OUStringBuffer aBuffer; if( nData > 9 ) - aBuffer.append( OUString::valueOf( static_cast< sal_Int64 >( nData / 10 ) ) ); + aBuffer.append( OUString::number( nData / 10 ) ); aBuffer.append( static_cast< sal_Unicode >( '0' + (nData % 10) ) ); appendString( rStr, aBuffer.makeStringAndClear(), nWidth, cFill ); } void StringHelper::appendDec( OUStringBuffer& rStr, sal_Int64 nData, sal_Int32 nWidth, sal_Unicode cFill ) { - appendString( rStr, OUString::valueOf( nData ), nWidth, cFill ); + appendString( rStr, OUString::number( nData ), nWidth, cFill ); } void StringHelper::appendDec( OUStringBuffer& rStr, double fData, sal_Int32 nWidth, sal_Unicode cFill ) diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index bd38cd4dc64b..59ce8a6652f7 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -59,13 +59,13 @@ sal_Int32 OleInputObjectBase::dumpStdClipboardFormat( const String& rName ) OUString OleInputObjectBase::dumpAnsiString32OrStdClip( const String& rName ) { sal_Int32 nLen = mxStrm->readInt32(); - return (nLen < 0) ? OUString::valueOf( dumpStdClipboardFormat( rName ) ) : dumpCharArray( rName, nLen, RTL_TEXTENCODING_MS_1252 ); + return (nLen < 0) ? OUString::number( dumpStdClipboardFormat( rName ) ) : dumpCharArray( rName, nLen, RTL_TEXTENCODING_MS_1252 ); } OUString OleInputObjectBase::dumpUniString32OrStdClip( const String& rName ) { sal_Int32 nLen = mxStrm->readInt32(); - return (nLen < 0) ? OUString::valueOf( dumpStdClipboardFormat( rName ) ) : dumpUnicodeArray( rName, nLen ); + return (nLen < 0) ? OUString::number( dumpStdClipboardFormat( rName ) ) : dumpUnicodeArray( rName, nLen ); } void OleInputObjectBase::writeOleColorItem( const String& rName, sal_uInt32 nColor ) @@ -1944,7 +1944,7 @@ bool VbaContainerStorageObject::isFormStorage( const OUString& rStrgPath ) const if( (aId.getLength() == 2) && (aId[ 0 ] == '0') ) aId = aId.copy( 1 ); sal_Int32 nId = aId.toInt32(); - if( (nId > 0) && (OUString::valueOf( nId ) == aId) ) + if( (nId > 0) && (OUString::number( nId ) == aId) ) for( VbaFormSiteInfoVector::const_iterator aIt = maFormData.maSiteInfos.begin(), aEnd = maFormData.maSiteInfos.end(); aIt != aEnd; ++aIt ) if( aIt->mnId == nId ) return true; |