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 /svtools | |
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 'svtools')
-rw-r--r-- | svtools/source/config/fontsubstconfig.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/calendar.cxx | 6 | ||||
-rw-r--r-- | svtools/source/control/roadmap.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/ruler.cxx | 4 | ||||
-rw-r--r-- | svtools/source/dialogs/ServerDetailsControls.cxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/GraphicExportOptionsDialog.cxx | 2 | ||||
-rw-r--r-- | svtools/source/filter/exportdialog.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 8 | ||||
-rw-r--r-- | svtools/source/svrtf/rtfout.cxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/treecontrolpeer.cxx | 10 |
10 files changed, 21 insertions, 21 deletions
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx index eb189e46fe01..d0c9399dc071 100644 --- a/svtools/source/config/fontsubstconfig.cxx +++ b/svtools/source/config/fontsubstconfig.cxx @@ -127,7 +127,7 @@ void SvtFontSubstConfig::Commit() { OUString sPrefix(sNode); sPrefix += "/_"; - sPrefix += OUString::valueOf((sal_Int32)i); + sPrefix += OUString::number(i); sPrefix += "/"; SubstitutionStruct& pSubst = pImpl->aSubstArr[i]; diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 0955133a70e9..d058cea397e1 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -215,7 +215,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) // Tagestexte anlegen for (sal_Int32 i = 0; i < 31; ++i) - maDayTexts[i] = OUString::valueOf(i+1); + maDayTexts[i] = OUString::number(i+1); maDragScrollTimer.SetTimeoutHdl( STATIC_LINK( this, Calendar, ScrollHdl ) ); maDragScrollTimer.SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() ); @@ -957,7 +957,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) for ( sal_uInt16 nWeekCount = 0; nWeekCount < 6; nWeekCount++ ) { sal_Int32 nWeek = maCalendarWrapper.getValue( i18n::CalendarFieldIndex::WEEK_OF_YEAR); - OUString aWeekText(OUString::valueOf(nWeek)); + OUString aWeekText(OUString::number(nWeek)); long nOffX = (mnWeekWidth-WEEKNUMBER_OFFX)-GetTextWidth( aWeekText ); long nOffY = (mnDayHeight-GetTextHeight())/2; DrawText( Point( nDayX+nOffX, nDayY+nOffY ), aWeekText ); @@ -1281,7 +1281,7 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate ) pYearPopupMenus[i]->InsertItem( nYearIdCount+j, maCalendarWrapper.getDisplayName( i18n::CalendarDisplayIndex::MONTH, j-1, 1)); - aPopupMenu.InsertItem( 10+i, OUString::valueOf( static_cast<sal_Int32>(nYear+i) ) ); + aPopupMenu.InsertItem( 10+i, OUString::number( nYear+i ) ); aPopupMenu.SetPopupMenu( 10+i, pYearPopupMenus[i] ); nYearIdCount += 1000; } diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index a07a1eacd5e6..d3542881633e 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -762,7 +762,7 @@ namespace svt if ( mpID ) { - OUString aIDText = OUString::valueOf( (sal_Int32)( _nIndex + 1 ) ) + OUString( "." ); + OUString aIDText = OUString::number( ( _nIndex + 1 ) ) + OUString( "." ); mpID->SetText( aIDText ); } diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 3ca7f3e95d54..369e7f86b13e 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -555,9 +555,9 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) if ( !(nTick % nTick3) ) { if ( ( mnUnitIndex == RULER_UNIT_CHAR ) || ( mnUnitIndex == RULER_UNIT_LINE ) ) - aNumStr = OUString::valueOf( static_cast<sal_Int64>( nTick / nTickUnit ) ); + aNumStr = OUString::number( nTick / nTickUnit ); else - aNumStr = OUString::valueOf( static_cast<sal_Int64>( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit ) ); + aNumStr = OUString::number( nTick / aImplRulerUnitTab[mnUnitIndex].nTickUnit ); ImplVDrawText( nStart + n, nCenter, aNumStr, nMin, nMax ); ImplVDrawText( nStart - n, nCenter, aNumStr, nMin, nMax ); diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 07a2b0c268da..33803f10c0a0 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -103,7 +103,7 @@ INetURLObject HostDetailsContainer::getUrl( ) { sUrl = m_sScheme + "://" + sHost; if ( nPort != m_nDefaultPort ) - sUrl += ":" + OUString::valueOf( nPort ); + sUrl += ":" + OUString::number( nPort ); if ( !sPath.isEmpty( ) ) if ( sPath.indexOf( '/' ) != 0 ) sUrl += "/"; diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx index ac9358f0a543..cf248da84c54 100644 --- a/svtools/source/filter/GraphicExportOptionsDialog.cxx +++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx @@ -107,7 +107,7 @@ void GraphicExportOptionsDialog::updateHeight() void GraphicExportOptionsDialog::updateResolution() { - mpResolution->SetText( OUString::valueOf( (sal_Int32) mResolution ) ); + mpResolution->SetText( OUString::number( (sal_Int32) mResolution ) ); } Sequence<PropertyValue> GraphicExportOptionsDialog::getFilterData() diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index c9e648b75940..b4cfef9f162c 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -885,7 +885,7 @@ static OUString ImpValueOfInKB( const sal_Int64& rVal ) double fVal( static_cast<double>( rVal ) ); fVal /= ( 1 << 10 ); fVal += 0.05; - OUStringBuffer aVal( OUString::valueOf( fVal ) ); + OUStringBuffer aVal( OUString::number( fVal ) ); sal_Int32 nX( OUString( aVal.getStr() ).indexOf( '.', 0 ) ); if ( nX > 0 ) aVal.setLength( nX + 2 ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 72e30154ea09..463b99e92b1f 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -193,19 +193,19 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj aParams += aChar; aParams += OUString( ";width=\"" ); - aParams += OUString::valueOf( rObjDesc.maSize.Width() ); + aParams += OUString::number( rObjDesc.maSize.Width() ); aParams += aChar; aParams += OUString( ";height=\"" ); - aParams += OUString::valueOf( rObjDesc.maSize.Height() ); + aParams += OUString::number( rObjDesc.maSize.Height() ); aParams += aChar; aParams += OUString( ";posx=\"" ); - aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() ); + aParams += OUString::number( rObjDesc.maDragStartPos.X() ); aParams += aChar; aParams += OUString( ";posy=\"" ); - aParams += OUString::valueOf( rObjDesc.maDragStartPos.X() ); + aParams += OUString::number( rObjDesc.maDragStartPos.X() ); aParams += aChar; return aParams; diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 8ed05f77e2b8..64f7e12921f1 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -131,11 +131,11 @@ SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, // #i47831# add an additional whitespace, so that // "document whitespaces" are not ignored.; rStream << "\\uc" - << OString::valueOf(nLen).getStr() << " "; + << OString::number(nLen).getStr() << " "; *pUCMode = nLen; } rStream << "\\u" - << OString::valueOf( + << OString::number( static_cast<sal_Int32>(c)).getStr(); } diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 7130ffc9d6f8..3c52e8232578 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -1147,7 +1147,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue ) { sal_Int32 nValue = 0; if( rValue >>= nValue ) - sValue = OUString::valueOf( nValue ); + sValue = OUString::number( nValue ); break; } case TypeClass_BYTE: @@ -1156,21 +1156,21 @@ OUString TreeControlPeer::getEntryString( const Any& rValue ) { sal_uInt32 nValue = 0; if( rValue >>= nValue ) - sValue = OUString::valueOf( (sal_Int64)nValue ); + sValue = OUString::number( nValue ); break; } case TypeClass_HYPER: { sal_Int64 nValue = 0; if( rValue >>= nValue ) - sValue = OUString::valueOf( nValue ); + sValue = OUString::number( nValue ); break; } case TypeClass_UNSIGNED_HYPER: { sal_uInt64 nValue = 0; if( rValue >>= nValue ) - sValue = OUString::valueOf( (sal_Int64)nValue ); + sValue = OUString::number( nValue ); break; } case TypeClass_FLOAT: @@ -1178,7 +1178,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue ) { double fValue = 0.0; if( rValue >>= fValue ) - sValue = OUString::valueOf( fValue ); + sValue = OUString::number( fValue ); break; } case TypeClass_STRING: |