summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorJean-Noël Rouvignac <jn.rouvignac@gmail.com>2013-02-20 00:21:37 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-02-24 12:59:02 +0000
commit63b0ce97ba0f71c28a7880c741100b0240332e74 (patch)
tree9589db9bb4fd6e27acd750a549f7df71a169b928 /svtools
parent3648c3226d369ce7a547e48f824b876180559476 (diff)
fdo#38838 searched, replaced and removed String::CreateFromInt32().
I ran the following code replace: s/(Uni|Xub)?String\s*::\s*CreateFromInt32/OUString::number/ And finally removed String::CreateFromInt32(). Change-Id: I53b26a59c68511ae09f0ee82cfade210d0de3fa5 Reviewed-on: https://gerrit.libreoffice.org/2279 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/bmpmaker/bmpcore.cxx2
-rw-r--r--svtools/source/contnr/fileview.cxx6
-rw-r--r--svtools/source/contnr/svtabbx.cxx4
-rw-r--r--svtools/source/control/calendar.cxx8
-rw-r--r--svtools/source/control/toolbarmenuacc.cxx2
-rw-r--r--svtools/source/dialogs/prnsetup.cxx2
-rw-r--r--svtools/source/urlobj/inetimg.cxx4
7 files changed, 14 insertions, 14 deletions
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index 50ae2933086d..7e8247c67afe 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.cxx
@@ -128,7 +128,7 @@ void BmpCreator::ImplCreate( const ::std::vector< DirEntry >& rInDirs,
aString = aPrefix;
if( atoi( aLine.getStr() ) < 10000 )
- aString += String::CreateFromInt32( 0 );
+ aString += OUString::number( 0 );
// search for pngs by default
String aPngString( aString += rtl::OStringToOUString(aLine, RTL_TEXTENCODING_UTF8) );
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 9d846616fe64..dfb0a1095a54 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1572,7 +1572,7 @@ String SvtFileView::GetConfigString() const
DBG_ASSERT( pBar, "invalid headerbar" );
// sort order
- sRet += String::CreateFromInt32( mpImp->mnSortColumn );
+ sRet += OUString::number( mpImp->mnSortColumn );
sRet += ';';
HeaderBarItemBits nBits = pBar->GetItemBits( mpImp->mnSortColumn );
sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
@@ -1583,9 +1583,9 @@ String SvtFileView::GetConfigString() const
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
sal_uInt16 nId = pBar->GetItemId(i);
- sRet += String::CreateFromInt32( nId );
+ sRet += OUString::number( nId );
sRet += ';';
- sRet += String::CreateFromInt32( pBar->GetItemSize( nId ) );
+ sRet += OUString::number( pBar->GetItemSize( nId ) );
sRet += ';';
}
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 829db41085dd..d52382c87077 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -1114,10 +1114,10 @@ sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Poin
sal_uInt16 nColumn = static_cast< sal_uInt16 >( _nPos % nColumnCount );
String aText( SVT_RESSTR(STR_SVT_ACC_DESC_TABLISTBOX) );
- aText.SearchAndReplace( sVar1, String::CreateFromInt32( nRow ) );
+ aText.SearchAndReplace( sVar1, OUString::number( nRow ) );
String sColHeader = m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( nColumn ) );
if ( sColHeader.Len() == 0 )
- sColHeader = String::CreateFromInt32( nColumn );
+ sColHeader = OUString::number( nColumn );
aText.SearchAndReplace( sVar2, sColHeader );
aRetText = aText;
}
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 529029ee671a..10c7c5056b34 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -1693,21 +1693,21 @@ void Calendar::RequestHelp( const HelpEvent& rHEvt )
sal_uInt16 nMonth = aDate.GetMonth();
XubString aStr( maDayText );
aStr.AppendAscii( ": " );
- aStr.Append( XubString::CreateFromInt32( aDate.GetDayOfYear() ) );
+ aStr.Append( OUString::number( aDate.GetDayOfYear() ) );
aStr.AppendAscii( " / " );
aStr.Append( maWeekText );
aStr.AppendAscii( ": " );
- aStr.Append( XubString::CreateFromInt32( nWeek ) );
+ aStr.Append( OUString::number( nWeek ) );
// Evt. noch Jahr hinzufuegen, wenn es nicht das gleiche ist
if ( (nMonth == 12) && (nWeek == 1) )
{
aStr.AppendAscii( ", " );
- aStr.Append( XubString::CreateFromInt32( aDate.GetYear()+1 ) );
+ aStr.Append( OUString::number( aDate.GetYear()+1 ) );
}
else if ( (nMonth == 1) && (nWeek > 50) )
{
aStr.AppendAscii( ", " );
- aStr.Append( XubString::CreateFromInt32( aDate.GetYear()-1 ) );
+ aStr.Append( OUString::number( aDate.GetYear()-1 ) );
}
Help::ShowQuickHelp( this, aDateRect, aStr );
return;
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index e193c1e38673..3d0642b680bc 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -748,7 +748,7 @@ sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeExcept
if( !aRet.Len() )
{
aRet = String( RTL_CONSTASCII_USTRINGPARAM( "Item " ) );
- aRet += String::CreateFromInt32( mpParent->mnEntryId );
+ aRet += OUString::number( mpParent->mnEntryId );
}
}
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 80ee93093393..b240f0b52ecf 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -206,7 +206,7 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
if ( nJobs && (nJobs != QUEUE_JOBS_DONTKNOW) )
{
XubString aJobStr( SVT_RESSTR( STR_SVT_PRNDLG_JOBCOUNT ) );
- XubString aJobs( XubString::CreateFromInt32( nJobs ) );
+ XubString aJobs( OUString::number( nJobs ) );
aJobStr.SearchAndReplaceAscii( "%d", aJobs );
ImplPrnDlgAddString( aStr, aJobStr );
}
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index d9f3c8d51b01..185e0246f5a3 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -36,9 +36,9 @@ sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const
(sString += aTargetURL ) += TOKEN_SEPARATOR;
(sString += aTargetFrame ) += TOKEN_SEPARATOR;
(sString += aAlternateText ) += TOKEN_SEPARATOR;
- sString += String::CreateFromInt32( aSizePixel.Width() );
+ sString += OUString::number( aSizePixel.Width() );
sString += TOKEN_SEPARATOR;
- sString += String::CreateFromInt32( aSizePixel.Height() );
+ sString += OUString::number( aSizePixel.Height() );
rtl::OString sOut(rtl::OUStringToOString(sString,
RTL_TEXTENCODING_UTF8));