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 /svx/source/svdraw | |
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 'svx/source/svdraw')
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 10 | ||||
-rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 6 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdtrans.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 8 |
5 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 5d50104572ac..68251fcd7e8c 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -667,11 +667,11 @@ SfxItemPresentation SdrFractionItem::GetPresentation( if(nValue.IsValid()) { sal_Int32 nDiv = nValue.GetDenominator(); - rText = OUString::valueOf(nValue.GetNumerator()); + rText = OUString::number(nValue.GetNumerator()); if(nDiv != 1) { - rText = rText + "/" + OUString::valueOf(nDiv); + rText = rText + "/" + OUString::number(nDiv); } } else @@ -721,7 +721,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation( { sal_Int32 nDiv = GetValue().GetDenominator(); - rText = OUString::valueOf(GetValue().GetNumerator()) + ":" + OUString::valueOf(nDiv); + rText = OUString::number(GetValue().GetNumerator()) + ":" + OUString::number(nDiv); } else { @@ -876,7 +876,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation( if(bNeg) nValue = -nValue; - OUStringBuffer aText = OUString::valueOf(nValue); + OUStringBuffer aText = OUString::number(nValue); if(nValue) { @@ -1360,7 +1360,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation( if(nValue < 0) { - rText = OUString::valueOf(-nValue) + "pixel"; + rText = OUString::number(-nValue) + "pixel"; } else { diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 9679d72733fc..4118b8e825ec 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -317,7 +317,7 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con switch (_nColId) { case ITEMBROWSER_WHICHCOL_ID: - sRet = OUString::valueOf( static_cast<sal_Int32>(pEntry->nWhichId) ); break; + sRet = OUString::number( pEntry->nWhichId ); break; case ITEMBROWSER_STATECOL_ID: { switch (pEntry->eState) @@ -514,9 +514,9 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) aNeuNam += pEntry->GetItemTypeStr(); if (pEntry->bCanNum) { aNeuNam.AppendAscii(": "); - aNeuNam += OUString::valueOf(pEntry->nMin); + aNeuNam += OUString::number(pEntry->nMin); aNeuNam.AppendAscii(".."); - aNeuNam += OUString::valueOf(pEntry->nMax); + aNeuNam += OUString::number(pEntry->nMax); } aNeuNam.AppendAscii(" - Type 'del' to reset to default."); pParent->SetText(aNeuNam); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index bcbcbf250eb2..e952af6c4a29 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1409,7 +1409,7 @@ void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPer nMul += nDiv/2; nMul /= nDiv; - rStr = OUString::valueOf(nMul); + rStr = OUString::number(nMul); if(bNeg) rStr.Insert(sal_Unicode('-'), 0); diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 60db7b97bb98..89a8ddc4499b 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -866,7 +866,7 @@ void SdrFormatter::TakeStr(long nVal, OUString& rStr) const if(nMul_ != nDiv_) nVal = BigMulDiv(nVal, nMul_, nDiv_); - OUStringBuffer aStr = OUString::valueOf(nVal); + OUStringBuffer aStr = OUString::number(nVal); if(nC > 0 && aStr.getLength() <= nC ) { diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 89d07820b02d..fc97b305dfa3 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1253,13 +1253,13 @@ XubString SdrView::GetStatusText() if (nLen==0) bBrk=true; // to be sure } - aStr.SearchAndReplaceAscii("%1", OUString::valueOf(nPar + 1)); - aStr.SearchAndReplaceAscii("%2", OUString::valueOf(nLin + 1)); - aStr.SearchAndReplaceAscii("%3", OUString::valueOf(nCol + 1)); + aStr.SearchAndReplaceAscii("%1", OUString::number(nPar + 1)); + aStr.SearchAndReplaceAscii("%2", OUString::number(nLin + 1)); + aStr.SearchAndReplaceAscii("%3", OUString::number(nCol + 1)); #ifdef DBG_UTIL aStr += OUString( ", Level " ); - aStr += OUString::valueOf( sal_Int32( pTextEditOutliner->GetDepth( aSel.nEndPara )) ); + aStr += OUString::number( pTextEditOutliner->GetDepth( aSel.nEndPara ) ); #endif } |