Replaced O[U]String::valueOf( static_cast<> ) with O[U]String::number()

Change-Id: I2f11f2f15a652a9edc3c7e5b67c854debeed20de
Reviewed-on: https://gerrit.libreoffice.org/1784
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>

15 files changed, 23 insertions, 23 deletions

diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 1b2888c0b982..9cdb2a75e2f6 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -786,7 +786,7 @@ rtl::OUString ScDPDimensionSaveData::CreateGroupDimName(
     {
         rtl::OUString aDimName( rSourceName );
         if ( !bUseSource )
-            aDimName += rtl::OUString::valueOf(static_cast<sal_Int32>(nAdd));
+            aDimName += OUString::number(nAdd);
         bool bExists = false;
 
         // look for existing group dimensions
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index eb200db3626c..fc096a8c6fa3 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -2798,7 +2798,7 @@ void ScDPResultDimension::LateInitFrom(
 {
     if ( rParams.IsEnd( nPos ) )
         return;
-    OSL_ENSURE( nPos <= pItemData.size(), rtl::OString::valueOf(static_cast<sal_Int32>(pItemData.size())).getStr() );
+    OSL_ENSURE( nPos <= pItemData.size(), OString::number(pItemData.size()).getStr() );
     ScDPDimension* pThisDim = rParams.GetDim( nPos );
     ScDPLevel* pThisLevel = rParams.GetLevel( nPos );
     SCROW rThisData = pItemData[nPos];
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 0ef12c742ded..74294675fef2 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2395,7 +2395,7 @@ void getFormatString(SvNumberFormatter* pFormatter, sal_uLong nFormat, String& r
         }
     }
     if( bAppendPrec )
-        rFmtStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nPrec));
+        rFmtStr += OUString::number(nPrec);
     const SvNumberformat* pFormat = pFormatter->GetEntry( nFormat );
     if( lcl_FormatHasNegColor( pFormat ) )
         rFmtStr += '-';
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 3ac521235ff5..51eb967bcaa9 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -572,7 +572,7 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
         aEntry.eConnect = SC_AND;
 
         rItem.meType = ScQueryEntry::ByString;
-        rItem.maString = rtl::OUString::valueOf(static_cast<sal_Int32>(nCntOfTop10));
+        rItem.maString = OUString::number(nCntOfTop10);
 
         rStrm.Ignore(20);
         return;
@@ -640,7 +640,7 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm )
             case EXC_AFTYPE_BOOLERR:
                 rStrm >> nBoolErr >> nVal;
                 rStrm.Ignore( 6 );
-                rItem.maString = rtl::OUString::valueOf(static_cast<sal_Int32>(nVal));
+                rItem.maString = OUString::number(nVal);
                 bIgnore = (nBoolErr != 0);
             break;
             case EXC_AFTYPE_EMPTY:
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 0120a38d4ae8..f416f58fd9a1 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1233,7 +1233,7 @@ rtl::OString createHexStringFromDigit(sal_uInt8 nDigit)
 {
     rtl::OString aString = rtl::OString::valueOf( static_cast<sal_Int32>(nDigit), 16 );
     if(aString.getLength() == 1)
-        aString = aString + rtl::OString::valueOf(static_cast<sal_Int32>(0));
+        aString = aString + OString::number(0);
     return aString;
 }
 
diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx
index 53ab66ba2ec5..d4109e64636f 100644
--- a/sc/source/filter/excel/xeextlst.cxx
+++ b/sc/source/filter/excel/xeextlst.cxx
@@ -140,8 +140,8 @@ void XclExpExtDataBar::SaveXml( XclExpXmlStream& rStrm )
 {
     sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream();
     rWorksheet->startElementNS( XML_x14, XML_dataBar,
-                                XML_minLength, rtl::OString::valueOf(static_cast<sal_Int32>(0)).getStr(),
-                                XML_maxLength, rtl::OString::valueOf(static_cast<sal_Int32>(100)).getStr(),
+                                XML_minLength, OString::number(0).getStr(),
+                                XML_maxLength, OString::number(100).getStr(),
                                 XML_axisPosition, getAxisPosition(meAxisPosition),
                                 FSEND );
 
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 809786747363..a7b8b032160c 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1213,7 +1213,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm )
 {
     sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
     rStyleSheet->singleElement( XML_numFmt,
-            XML_numFmtId,   OString::valueOf( static_cast<sal_Int32>(mnXclNumFmt) ).getStr(),
+            XML_numFmtId,   OString::number( mnXclNumFmt ).getStr(),
             XML_formatCode, rtl::OUStringToOString(maNumFmtString, RTL_TEXTENCODING_UTF8).getStr(),
             FSEND );
 }
@@ -2988,7 +2988,7 @@ void XclExpDxfs::SaveXml( XclExpXmlStream& rStrm )
 
     sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
     rStyleSheet->startElement( XML_dxfs,
-            XML_count, rtl::OString::valueOf( static_cast<sal_Int32>(maDxf.size())).getStr(),
+            XML_count, OString::number(maDxf.size()).getStr(),
             FSEND );
 
     for ( DxfContainer::iterator itr = maDxf.begin(); itr != maDxf.end(); ++itr )
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 6eecf7eda716..84a6042afaa1 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -79,7 +79,7 @@ void XclPCItem::SetDateTime( const DateTime& rDateTime )
 void XclPCItem::SetInteger( sal_Int16 nValue )
 {
     meType = EXC_PCITEM_INTEGER;
-    maText = rtl::OUString::valueOf(static_cast<sal_Int32>(nValue));
+    maText = OUString::number(nValue);
     mnValue = nValue;
 }
 
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index 14d8cb23238b..4834122038f8 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -484,7 +484,7 @@ OUString XclTools::GetXclBuiltInDefName( sal_Unicode cBuiltIn )
     if( cBuiltIn < SAL_N_ELEMENTS( ppcDefNames ) )
         return rtl::OUString::createFromAscii(ppcDefNames[cBuiltIn]);
     else
-        return rtl::OUString::valueOf(static_cast<sal_Int32>(cBuiltIn));
+        return OUString::number(cBuiltIn);
 }
 
 OUString XclTools::GetBuiltInDefName( sal_Unicode cBuiltIn )
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index de2888e27cb7..6b93348afaf7 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -424,7 +424,7 @@ void ScHTMLExport::WriteOverview()
             {
                 pDoc->GetName( nTab, aStr );
                 rStrm << "<A HREF=\"#table"
-                    << rtl::OString::valueOf(static_cast<sal_Int32>(nTab)).getStr()
+                    << OString::number(nTab).getStr()
                     << "\">";
                 OUT_STR( aStr );
                 rStrm << "</A>";
@@ -686,7 +686,7 @@ void ScHTMLExport::WriteTables()
 
                 // Anker festlegen:
                 rStrm << "<A NAME=\"table"
-                    << rtl::OString::valueOf(static_cast<sal_Int32>(nTab)).getStr()
+                    << OString::number(nTab).getStr()
                     << "\">";
                 TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 );
                 OUT_STR( aStrOut );
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 3c943a505ecd..a26137dad4e6 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1832,7 +1832,7 @@ sal_Int32 lclCreatePredefinedFormat( const Reference< XNumberFormats >& rxNumFmt
     catch( Exception& )
     {
         OSL_FAIL( OStringBuffer( "lclCreatePredefinedFormat - cannot create predefined number format " ).
-            append( OString::valueOf( static_cast< sal_Int32 >( nPredefId ) ) ).getStr() );
+            append( OString::number( nPredefId ) ).getStr() );
     }
     return nIndex;
 }
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 59948507a7b2..a8d1a5fb16fc 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1018,7 +1018,7 @@ sal_uLong Sc10Import::Import()
 #if OSL_DEBUG_LEVEL > 0
     if (nError)
     {
-        OSL_FAIL( rtl::OString::valueOf(static_cast<sal_Int32>(nError)).getStr());
+        OSL_FAIL( OString::number(nError).getStr());
     }
 #endif
 
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index de931b033a6a..a0b53b86ccb2 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -919,7 +919,7 @@ void ScXMLExport::WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_In
         AddAttribute(XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_COLLAPSE);
     if (nRepeatColumns > 1)
     {
-        OUString sOUEndCol(OUString::valueOf(static_cast <sal_Int32> (nRepeatColumns)));
+        OUString sOUEndCol(OUString::number(nRepeatColumns));
         AddAttribute(sAttrColumnsRepeated, sOUEndCol);
     }
     if (nIndex != -1)
@@ -4161,7 +4161,7 @@ void ScXMLExport::WriteExternalRefCaches()
             {
                 if (nMaxColsUsed > 1)
                     AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED,
-                                    OUString::valueOf(static_cast<sal_Int32>(nMaxColsUsed)));
+                                    OUString::number(nMaxColsUsed));
                 SvXMLElementExport aElemColumn(*this, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true);
             }
 
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index 581954c50db4..353b50ba29b1 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -271,9 +271,9 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl )
         if(!maEdMin.GetText().Len())
         {
             if(nSelectMin == COLORSCALE_PERCENTILE || nSelectMin == COLORSCALE_PERCENT)
-                maEdMin.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(50)));
+                maEdMin.SetText(OUString::number(50));
             else
-                maEdMin.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(0)));
+                maEdMin.SetText(OUString::number(0));
         }
     }
 
@@ -286,9 +286,9 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl )
         if(!maEdMax.GetText().Len())
         {
             if(nSelectMax == COLORSCALE_PERCENTILE || nSelectMax == COLORSCALE_PERCENT)
-                maEdMax.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(50)));
+                maEdMax.SetText(OUString::number(50));
             else
-                maEdMax.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(0)));
+                maEdMax.SetText(OUString::number(0));
         }
     }
     return 0;
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 20e3f813324d..adb0f27e74a8 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -835,7 +835,7 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDo
         maLbEntryTypeMin.SelectEntryPos(0);
         maLbEntryTypeMiddle.SelectEntryPos(2);
         maLbEntryTypeMax.SelectEntryPos(1);
-        maEdMiddle.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(50)));
+        maEdMiddle.SetText(OUString::number(50));
     }
     FreeResource();