diff options
author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-02-20 00:20:41 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-02-22 17:23:19 +0000 |
commit | 6119e15c8b2b19c6ea3c271fb1c9d7e047902e77 (patch) | |
tree | 8091c89f3bb3e95c1238078152871b8819f0bdc3 /svx/source | |
parent | eb451cbc1aa2f96b1a913d85823ef27275ad367b (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: I7c047cf1c90632bddc23ed49f9455d745ac8688e
Reviewed-on: https://gerrit.libreoffice.org/2282
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/svxruler.cxx | 4 | ||||
-rw-r--r-- | svx/source/engine3d/float3d.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/datanavi.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmobj.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/navigatortree.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/galbrws1.cxx | 6 | ||||
-rw-r--r-- | svx/source/gallery2/gallery1.cxx | 2 | ||||
-rw-r--r-- | svx/source/gallery2/galtheme.cxx | 4 | ||||
-rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 2 | ||||
-rw-r--r-- | svx/source/stbctrls/zoomctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 6 | ||||
-rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 2 | ||||
-rw-r--r-- | svx/source/unodraw/UnoGraphicExporter.cxx | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/_xoutbmp.cxx | 2 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 6 |
16 files changed, 27 insertions, 27 deletions
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index f94e86bf062c..e9b3add4c949 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1515,7 +1515,7 @@ long SvxRuler::GetCorrectedDragPos( sal_Bool bLeft, sal_Bool bRight ) { const long lNullPix = Ruler::GetNullOffset(); long lDragPos = GetDragPos() + lNullPix; -ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos)) +ADD_DEBUG_TEXT("lDragPos: ", OUString::number(lDragPos)) sal_Bool bHoriRows = bHorz && pRuler_Imp->bIsTableRows; if((bLeft || (bHoriRows)) && lDragPos < nMaxLeft) lDragPos = nMaxLeft; @@ -1935,7 +1935,7 @@ void SvxRuler::DragBorders() { case RULER_DRAGSIZE_MOVE: { -ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargin)) +ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(pRuler_Imp->lLastLMargin)) lDiff = GetDragType()==RULER_TYPE_BORDER ? lPos-nDragOffset - pBorders[nIdx].nPos : GetDragType() == RULER_TYPE_MARGIN1 ? lPos - pRuler_Imp->lLastLMargin : lPos - pRuler_Imp->lLastRMargin; diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 7ab244af5354..3304d2299328 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -3055,13 +3055,13 @@ sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) { String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R)); - aStr += String::CreateFromInt32((sal_Int32)rColor.GetRed()); + aStr += OUString::number((sal_Int32)rColor.GetRed()); aStr += sal_Unicode(' '); aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G)); - aStr += String::CreateFromInt32((sal_Int32)rColor.GetGreen()); + aStr += OUString::number((sal_Int32)rColor.GetGreen()); aStr += sal_Unicode(' '); aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B)); - aStr += String::CreateFromInt32((sal_Int32)rColor.GetBlue()); + aStr += OUString::number((sal_Int32)rColor.GetBlue()); sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr ); pLb->SelectEntryPos( nPos ); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index f38c616b7cb2..fe5d9faebe20 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2216,7 +2216,7 @@ namespace svxform { SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without name" ); String sTemp = rtl::OUString("untitled"); - sTemp += String::CreateFromInt32( nPageId ); + sTemp += OUString::number( nPageId ); sInstName = sTemp; } m_aTabCtrl.InsertPage( nPageId, sInstName, m_aTabCtrl.GetPageCount() - 2 ); diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 75f10fc169f7..82bcd0c917b8 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -434,7 +434,7 @@ namespace sal_Int32 nPos = getElementPos(xParent, xChild); // prepend this current relaive pos - sCurrentIndex = String::CreateFromInt32(nPos); + sCurrentIndex = OUString::number(nPos); if (sReturn.Len() != 0) { sCurrentIndex += '\\'; diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b4b1e6cc021c..e9b0a282838d 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1818,7 +1818,7 @@ namespace svxform else { aUndoStr = SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE_MULTIPLE); - aUndoStr.SearchAndReplaceAscii( "#", String::CreateFromInt32( m_arrCurrentSelection.size() ) ); + aUndoStr.SearchAndReplaceAscii( "#", OUString::number( m_arrCurrentSelection.size() ) ); } pFormModel->BegUndo(aUndoStr); } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 52ab61721c72..77e1eaa2d31a 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -330,7 +330,7 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog { aTitle = mpExchangeData->aEditedTitle; aTitle += ' '; - aTitle += String::CreateFromInt32( nCount ); + aTitle += OUString::number( nCount ); } mpGallery->RenameTheme( aOldName, aTitle ); @@ -435,7 +435,7 @@ void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) { aName = aNewName; aName += ' '; - aName += String::CreateFromInt32( nCount ); + aName += OUString::number( nCount ); } mpGallery->RenameTheme( aOldName, aName ); @@ -687,7 +687,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl) { aName = aNewTheme; aName += ' '; - aName += String::CreateFromInt32( nCount ); + aName += OUString::number( nCount ); } if( !mpGallery->HasTheme( aName ) && mpGallery->CreateTheme( aName ) ) diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index a6bb21c0ac69..628d344fa0c1 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -57,7 +57,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); String aFileName( String( "sg" ) ); - aURL.Append( ( aFileName += String::CreateFromInt32( nFileNumber ) ) += String( RTL_CONSTASCII_USTRINGPARAM( ".thm" ) ) ); + aURL.Append( ( aFileName += OUString::number( nFileNumber ) ) += String( RTL_CONSTASCII_USTRINGPARAM( ".thm" ) ) ); aThmURL = ImplGetURLIgnoreCase( aURL ); aURL.setExtension( String( RTL_CONSTASCII_USTRINGPARAM( "sdg" ) ) ); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 183aa343742a..1a095492739d 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -307,7 +307,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt if( SGA_OBJ_SVDRAW == eObjKind ) { String aFileName( RTL_CONSTASCII_USTRINGPARAM( "gallery/svdraw/dd" ) ); - aNewURL = INetURLObject( aFileName += String::CreateFromInt32( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE ); + aNewURL = INetURLObject( aFileName += OUString::number( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE ); bExists = sal_False; @@ -322,7 +322,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt { String aFileName( RTL_CONSTASCII_USTRINGPARAM( "dd" ) ); - aFileName += String::CreateFromInt32( ++nNextNumber % 999999 ); + aFileName += OUString::number( ++nNextNumber % 999999 ); aFileName += String( pExt, RTL_TEXTENCODING_ASCII_US ); aNewURL = aDir; diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 4803bbcc2096..e4b7f5f56e6b 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -271,7 +271,7 @@ namespace sdr String aNewStyleSheetName(GetStyleSheet()->GetName()); aNewStyleSheetName.Erase(aNewStyleSheetName.Len() - 1, 1); sal_Int16 nDepth = rOutliner.GetDepth((sal_uInt16)nPara); - aNewStyleSheetName += String::CreateFromInt32( nDepth <= 0 ? 1 : nDepth + 1); + aNewStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth + 1); SdrModel* pModel = rObj.GetModel(); SfxStyleSheetBasePool* pStylePool = (pModel != NULL) ? pModel->GetStyleSheetPool() : 0L; diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 74d73d2d0173..8ad0c2ef1435 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -120,7 +120,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, { const SfxUInt16Item* pItem = (const SfxUInt16Item*)pState; nZoom = pItem->GetValue(); - String aStr( String::CreateFromInt32(nZoom) ); + String aStr( OUString::number(nZoom) ); aStr += '%'; GetStatusBar().SetItemText( GetId(), aStr ); @@ -140,7 +140,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, void SvxZoomStatusBarControl::Paint( const UserDrawEvent& ) { - String aStr( String::CreateFromInt32( nZoom )); + String aStr( OUString::number( nZoom )); aStr += '%'; GetStatusBar().SetItemText( GetId(), aStr ); } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 075e3c8ddeb6..a35262f020dd 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -160,7 +160,7 @@ void FontWorkGalleryDialog::fillFavorites( sal_uInt16 nThemeId, std::vector< Bit { String aStr(SVX_RES(RID_SVXFLOAT3D_FAVORITE)); aStr += sal_Unicode(' '); - aStr += String::CreateFromInt32((sal_Int32)nFavorite); + aStr += OUString::number((sal_Int32)nFavorite); Image aThumbImage( *rFavorites[nFavorite-1] ); maCtlFavorites.InsertItem( (sal_uInt16)nFavorite, aThumbImage, aStr ); } diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 6ed4c36c66df..ff5bbc7b8e29 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -284,9 +284,9 @@ void TableWindow::Paint( const Rectangle& ) if ( nCol && nLine ) { String aText; - aText += String::CreateFromInt32( nCol ); + aText += OUString::number( nCol ); aText.AppendAscii( " x " ); - aText += String::CreateFromInt32( nLine ); + aText += OUString::number( nLine ); if(GetId() == FN_SHOW_MULTIPLE_PAGES) { aText += ' '; @@ -659,7 +659,7 @@ void ColumnsWindow::Paint( const Rectangle& ) SetFillColor( aFaceColor ); String aText; if ( nCol ) - aText = String::CreateFromInt32(nCol); + aText = OUString::number(nCol); else aText = comphelper::string::remove(Button::GetStandardText(BUTTON_CANCEL), '~'); diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 15ee615c1d1f..cbdbbfa89586 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -216,7 +216,7 @@ void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount ) aActionStr = String(SVX_RES(nId)); String aText( aActionStr ); - aText.SearchAndReplaceAllAscii( "$(ARG1)", String::CreateFromInt32( nCount ) ); + aText.SearchAndReplaceAllAscii( "$(ARG1)", OUString::number( nCount ) ); pPopupWin->SetText( aText ); } diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index d1467bfeb533..6efefc7f84f4 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -353,7 +353,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo) aPageNumValue += sal_Unicode(' '); break; default: - aPageNumValue += String::CreateFromInt32( (sal_Int32)mnPageNumber ); + aPageNumValue += OUString::number( (sal_Int32)mnPageNumber ); } pInfo->SetRepresentation( aPageNumValue ); diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 33a2df50caed..09ca1d9f7775 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -148,7 +148,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, aName += '_'; aName += String(aURL.getExtension()); aName += '_'; - String aStr( String::CreateFromInt32( rGraphic.GetChecksum(), 16 ) ); + String aStr( OUString::number( rGraphic.GetChecksum(), 16 ) ); if ( aStr.GetChar(0) == '-' ) aStr.SetChar(0,'m'); aName += aStr; diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 3607d5ccc493..26bc642aaaca 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -298,7 +298,7 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn } } aUniqueName = aUser; - aUniqueName += String::CreateFromInt32( nUserIndex ); + aUniqueName += OUString::number( nUserIndex ); } } @@ -1942,7 +1942,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const { aUniqueName = aUser; aUniqueName += sal_Unicode(' '); - aUniqueName += String::CreateFromInt32( nUserIndex ); + aUniqueName += OUString::number( nUserIndex ); } } @@ -2294,7 +2294,7 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const { aUniqueName = aUser; aUniqueName += sal_Unicode(' '); - aUniqueName += String::CreateFromInt32( nUserIndex ); + aUniqueName += OUString::number( nUserIndex ); } } |