diff options
author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-20 00:21:37 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-02-24 12:59:02 +0000 |
commit | 63b0ce97ba0f71c28a7880c741100b0240332e74 (patch) | |
tree | 9589db9bb4fd6e27acd750a549f7df71a169b928 /dbaccess | |
parent | 3648c3226d369ce7a547e48f824b876180559476 (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 'dbaccess')
-rw-r--r-- | dbaccess/source/ext/macromigration/macromigrationpages.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/control/TableGrantCtrl.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/directsql.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/indexdialog.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/sqlmessage.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/QueryTableView.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TEditControl.cxx | 8 |
9 files changed, 16 insertions, 16 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 18ae6c65d725..84302b60ac78 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -226,8 +226,8 @@ namespace dbmm void ProgressPage::setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports ) { String sText( m_aObjectCount.GetText() ); - sText.SearchAndReplaceAscii( "$forms$", String::CreateFromInt32( _nForms ) ); - sText.SearchAndReplaceAscii( "$reports$", String::CreateFromInt32( _nReports ) ); + sText.SearchAndReplaceAscii( "$forms$", OUString::number( _nForms ) ); + sText.SearchAndReplaceAscii( "$reports$", OUString::number( _nReports ) ); m_aObjectCount.SetText( sText ); } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 0bf88fe5a3ab..4a0b57a37e13 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1470,7 +1470,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if( pTextLen ) { - pTextLen->SetText( String::CreateFromInt32(pFieldDescr->GetPrecision()) ); + pTextLen->SetText( OUString::number(pFieldDescr->GetPrecision()) ); pTextLen->ClearModifyFlag(); } @@ -1480,10 +1480,10 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) } if( pLength ) - pLength->SetText( String::CreateFromInt32(pFieldDescr->GetPrecision()) ); + pLength->SetText( OUString::number(pFieldDescr->GetPrecision()) ); if( pScale ) - pScale->SetText( String::CreateFromInt32(pFieldDescr->GetScale()) ); + pScale->SetText( OUString::number(pFieldDescr->GetScale()) ); if( pFormat ) UpdateFormatSample(pFieldDescr); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 4ec87d096606..f9e8bc082642 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -285,7 +285,7 @@ String OTableGrantControl::GetCellText( long nRow, sal_uInt16 nColId ) const if(aFind != m_aPrivMap.end()) nPriv = aFind->second.nRights; - return String::CreateFromInt32(isAllowed(nColId,nPriv) ? 1 :0); + return OUString::number(isAllowed(nColId,nPriv) ? 1 :0); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 9ce1968fed68..21c5ab969a1e 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -286,7 +286,7 @@ DBG_NAME(DirectSQLDialog) //-------------------------------------------------------------------- void DirectSQLDialog::addStatusText(const String& _rMessage) { - String sAppendMessage = String::CreateFromInt32(m_nStatusCount++); + String sAppendMessage = OUString::number(m_nStatusCount++); sAppendMessage += rtl::OUString(": "); sAppendMessage += _rMessage; sAppendMessage += rtl::OUString("\n\n"); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index d9b26902d984..ef2e698a06f3 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -379,7 +379,7 @@ DBG_NAME(DbaIndexDialog) for ( i = 1; i < 0x7FFFFFFF; ++i ) { sNewIndexName = sNewIndexNameBase; - sNewIndexName += String::CreateFromInt32(i); + sNewIndexName += OUString::number(i); if (m_pIndexes->end() == m_pIndexes->find(sNewIndexName)) break; } diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index c46035c7bdcf..874311a625bb 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -260,7 +260,7 @@ namespace aDisplayInfo.sMessage = pCurrentError->Message.trim(); aDisplayInfo.sSQLState = pCurrentError->SQLState; if ( pCurrentError->ErrorCode ) - aDisplayInfo.sErrorCode = String::CreateFromInt32( pCurrentError->ErrorCode ); + aDisplayInfo.sErrorCode = OUString::number( pCurrentError->ErrorCode ); if ( !aDisplayInfo.sMessage.Len() && !lcl_hasDetails( aDisplayInfo ) diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index ec1c75dffe19..db886aada62b 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -258,7 +258,7 @@ sal_Int32 OQueryTableView::CountTableAlias(const String& rName, sal_Int32& rMax) String aNewName; aNewName = rName; aNewName += '_'; - aNewName += String::CreateFromInt32(++nRet); + aNewName += OUString::number(++nRet); aIter = GetTabWinMap()->find(aNewName); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 2bfcc1f00f54..381b8c47a3c3 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1037,7 +1037,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() case BROW_ORDER_ROW: { - strOldCellContents = String::CreateFromInt32((sal_uInt16)pEntry->GetOrderDir()); + strOldCellContents = OUString::number((sal_uInt16)pEntry->GetOrderDir()); sal_uInt16 nIdx = m_pOrderCell->GetSelectEntryPos(); if (nIdx == sal_uInt16(-1)) nIdx = 0; @@ -1048,7 +1048,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() m_pVisibleCell->GetBox().Check(); RowModified(GetBrowseRow(BROW_VIS_ROW), GetCurColumnId()); } - sNewValue = String::CreateFromInt32((sal_uInt16)pEntry->GetOrderDir()); + sNewValue = OUString::number((sal_uInt16)pEntry->GetOrderDir()); } break; case BROW_COLUMNALIAS_ROW: diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 27cfa5f3ca64..184a9606902c 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -897,7 +897,7 @@ String OTableEditorCtrl::GenerateName( const String& rName ) while( HasFieldName(aFieldName) ) { aFieldName = aBaseName; - aFieldName += String::CreateFromInt32(i); + aFieldName += OUString::number(i); i++; } @@ -1227,7 +1227,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) case FIELD_PROPERTY_TEXTLEN: case FIELD_PROPERTY_LENGTH: - sValue = String::CreateFromInt32(pFieldDescr->GetPrecision()); + sValue = OUString::number(pFieldDescr->GetPrecision()); break; case FIELD_PROPERTY_NUMTYPE: @@ -1239,7 +1239,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) break; case FIELD_PROPERTY_SCALE: - sValue = String::CreateFromInt32(pFieldDescr->GetScale()); + sValue = OUString::number(pFieldDescr->GetScale()); break; case FIELD_PROPERTY_BOOL_DEFAULT: @@ -1247,7 +1247,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) break; case FIELD_PROPERTY_FORMAT: - sValue = String::CreateFromInt32(pFieldDescr->GetFormatKey()); + sValue = OUString::number(pFieldDescr->GetFormatKey()); break; } |