diff options
author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-20 00:17:30 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-02-22 17:27:53 +0000 |
commit | bb5fa449378d6535932d39f2357c06e181647346 (patch) | |
tree | a6bb8252b2672e6a3edf42e0a7e8caeb9a19b247 /sc/source/ui/docshell | |
parent | 6119e15c8b2b19c6ea3c271fb1c9d7e047902e77 (diff) |
fdo#38838 search replace for String::CreateFromInt32().
I ran the following code replace:
s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/
Change-Id: I45edaec4de2481ad45f9bcae2e280d5aca487714
Reviewed-on: https://gerrit.libreoffice.org/2281
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r-- | sc/source/ui/docshell/dbdocimp.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh8.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/docshell/tpstat.cxx | 6 |
5 files changed, 21 insertions, 21 deletions
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 967958ec4e85..f45c7f20e288 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -367,7 +367,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, { String aPict = ScGlobal::GetRscString( STR_PROGRESS_IMPORT ); String aText = aPict.GetToken(0,'#'); - aText += String::CreateFromInt32( nInserted ); + aText += OUString::number( nInserted ); aText += aPict.GetToken(1,'#'); if (!aProgress.SetStateText( 0, aText )) // stopped by user? diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 4e32bca64cc3..b431f938ab1c 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -266,7 +266,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe { ++nCount; aNewName = aImport; - aNewName += String::CreateFromInt32( nCount ); + aNewName += OUString::number( nCount ); pDummy = rDBs.findByUpperName(ScGlobal::pCharClass->uppercase(aNewName)); } while (pDummy); diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 188588176676..cc474931cbeb 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -398,18 +398,18 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet break; case sdbc::DataType::VARCHAR: aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",C," )); - aHeader += String::CreateFromInt32( xMeta->getColumnDisplaySize( i+1 ) ); + aHeader += OUString::number( xMeta->getColumnDisplaySize( i+1 ) ); break; case sdbc::DataType::DECIMAL: { long nPrec = xMeta->getPrecision( i+1 ); long nScale = xMeta->getScale( i+1 ); aHeader.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",N," )); - aHeader += String::CreateFromInt32( + aHeader += OUString::number( SvDbaseConverter::ConvertPrecisionToDbase( nPrec, nScale ) ); aHeader += ','; - aHeader += String::CreateFromInt32( nScale ); + aHeader += OUString::number( nScale ); aScales[i] = nScale; } break; @@ -609,7 +609,7 @@ void lcl_GetColumnTypes( do { ++nSub; - String aVarPart = String::CreateFromInt32( nSub ); + String aVarPart = OUString::number( nSub ); if ( aFixPart.Len() + aVarPart.Len() > 10 ) aFixPart.Erase( 10 - aVarPart.Len() ); aFieldName = aFixPart; @@ -620,7 +620,7 @@ void lcl_GetColumnTypes( else { aFieldName = 'N'; - aFieldName += String::CreateFromInt32(nCol+1); + aFieldName += OUString::number(nCol+1); } if ( !bTypeDefined ) @@ -746,13 +746,13 @@ void lcl_GetColumnTypes( break; case sdbc::DataType::VARCHAR : aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",C," )); - aOutString += String::CreateFromInt32( nFieldLen ); + aOutString += OUString::number( nFieldLen ); break; case sdbc::DataType::DECIMAL : aOutString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ",N," )); - aOutString += String::CreateFromInt32( nFieldLen ); + aOutString += OUString::number( nFieldLen ); aOutString += ','; - aOutString += String::CreateFromInt32( nPrecision ); + aOutString += OUString::number( nPrecision ); break; } if ( !aOutString.EqualsIgnoreCaseAscii( aString ) ) diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 8cff0c90396e..0c9d73b12128 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1985,9 +1985,9 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) rtl_math_DecimalPlaces_Max, '.', true ); aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" )); - aBufStr += String::CreateFromInt32( c ); + aBufStr += OUString::number( c ); aBufStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ";Y" )); - aBufStr += String::CreateFromInt32( r ); + aBufStr += OUString::number( r ); aBufStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ";K" )); aBufStr += aValStr; lcl_WriteSimpleString( rStrm, aBufStr ); @@ -2000,9 +2000,9 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) aCellStr.SearchAndReplaceAll( rtl::OUString(_LF), rtl::OUString(SYLK_LF) ); aBufStr.AssignAscii(RTL_CONSTASCII_STRINGPARAM( "C;X" )); - aBufStr += String::CreateFromInt32( c ); + aBufStr += OUString::number( c ); aBufStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ";Y" )); - aBufStr += String::CreateFromInt32( r ); + aBufStr += OUString::number( r ); aBufStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ";K" )); lcl_WriteSimpleString( rStrm, aBufStr ); lcl_WriteString( rStrm, aCellStr, '"', ';' ); @@ -2047,9 +2047,9 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) nC += c - 1; nR += r - 1; aPrefix.AssignAscii( RTL_CONSTASCII_STRINGPARAM( ";R" ) ); - aPrefix += String::CreateFromInt32( nR ); + aPrefix += OUString::number( nR ); aPrefix.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ";C" ) ); - aPrefix += String::CreateFromInt32( nC ); + aPrefix += OUString::number( nC ); aPrefix.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ";M" ) ); } break; @@ -2058,9 +2058,9 @@ bool ScImportExport::Doc2Sylk( SvStream& rStrm ) ScAddress aPos; pFCell->GetMatrixOrigin( aPos ); aPrefix.AssignAscii( RTL_CONSTASCII_STRINGPARAM( ";I;R" ) ); - aPrefix += String::CreateFromInt32( aPos.Row() - nStartRow + 1 ); + aPrefix += OUString::number( aPos.Row() - nStartRow + 1 ); aPrefix.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ";C" ) ); - aPrefix += String::CreateFromInt32( aPos.Col() - nStartCol + 1 ); + aPrefix += OUString::number( aPos.Col() - nStartCol + 1 ); } break; default: diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index ced5f70b212a..86f73fb712dc 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -60,9 +60,9 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) String aInfo = aFlInfo.GetText(); aInfo += aDocStat.aDocName; aFlInfo .SetText( aInfo ); - aFtTables .SetText( String::CreateFromInt32( aDocStat.nTableCount ) ); - aFtCells .SetText( String::CreateFromInt32( aDocStat.nCellCount ) ); - aFtPages .SetText( String::CreateFromInt32( aDocStat.nPageCount ) ); + aFtTables .SetText( OUString::number( aDocStat.nTableCount ) ); + aFtCells .SetText( OUString::number( aDocStat.nCellCount ) ); + aFtPages .SetText( OUString::number( aDocStat.nPageCount ) ); FreeResource(); } |