summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
authorJean-Noël Rouvignac <jn.rouvignac@gmail.com>2013-02-20 00:17:30 +0100
committerMichael Stahl <mstahl@redhat.com>2013-02-22 17:27:53 +0000
commitbb5fa449378d6535932d39f2357c06e181647346 (patch)
treea6bb8252b2672e6a3edf42e0a7e8caeb9a19b247 /sc/source/ui/view
parent6119e15c8b2b19c6ea3c271fb1c9d7e047902e77 (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/view')
-rw-r--r--sc/source/ui/view/cellsh.cxx4
-rw-r--r--sc/source/ui/view/cellsh3.cxx2
-rw-r--r--sc/source/ui/view/colrowba.cxx4
-rw-r--r--sc/source/ui/view/dbfunc3.cxx2
-rw-r--r--sc/source/ui/view/gridwin4.cxx2
-rw-r--r--sc/source/ui/view/preview.cxx4
-rw-r--r--sc/source/ui/view/prevwsh.cxx12
-rw-r--r--sc/source/ui/view/printfun.cxx2
-rw-r--r--sc/source/ui/view/tabview.cxx2
-rw-r--r--sc/source/ui/view/tabview4.cxx8
-rw-r--r--sc/source/ui/view/viewdata.cxx34
11 files changed, 38 insertions, 38 deletions
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index faecae8890c5..ee9028e6f31c 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -659,9 +659,9 @@ void ScCellShell::GetState(SfxItemSet &rSet)
String aStr( ScGlobal::GetRscString( STR_TABLE ) );
aStr += ' ';
- aStr += String::CreateFromInt32( nTab + 1 );
+ aStr += OUString::number( nTab + 1 );
aStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
- aStr += String::CreateFromInt32( nTabCount );
+ aStr += OUString::number( nTabCount );
rSet.Put( SfxStringItem( nWhich, aStr ) );
}
break;
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 353f46903d0a..d6a0e81ec923 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -448,7 +448,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
do
{
aName = aBaseName;
- aName += String::CreateFromInt32( i );
+ aName += OUString::number( i );
if (bPrefix)
bValid = pDoc->ValidNewTabName( aName );
else
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index eed1ba9208e3..b4ca85e6bdab 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -92,7 +92,7 @@ sal_uInt16 ScColBar::GetEntrySize( SCCOLROW nEntryNo )
String ScColBar::GetEntryText( SCCOLROW nEntryNo )
{
return UseNumericHeader()
- ? String::CreateFromInt32( nEntryNo + 1 )
+ ? OUString::number( nEntryNo + 1 )
: ScColToAlpha( static_cast<SCCOL>(nEntryNo) );
}
@@ -257,7 +257,7 @@ sal_uInt16 ScRowBar::GetEntrySize( SCCOLROW nEntryNo )
String ScRowBar::GetEntryText( SCCOLROW nEntryNo )
{
- return String::CreateFromInt32( nEntryNo + 1 );
+ return OUString::number( nEntryNo + 1 );
}
void ScRowBar::SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize )
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 3a9dc0ad826c..88fb66e636d8 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -560,7 +560,7 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord )
static String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber )
{
String aName = rPrefix;
- aName += String::CreateFromInt32( nNumber );
+ aName += OUString::number( nNumber );
return aName;
}
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 9c48dd2d9645..084f37db514f 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1052,7 +1052,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
nPageNo += ((long)nRowPos)*nColBreaks+nColPos;
String aThisPageStr = aPageStr; // Don't modify the original string.
- aThisPageStr.SearchAndReplaceAscii("%1", String::CreateFromInt32(nPageNo));
+ aThisPageStr.SearchAndReplaceAscii("%1", OUString::number(nPageNo));
if ( pEditEng )
{
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 196ad9cd4d9b..be981b235d92 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -662,12 +662,12 @@ String ScPreview::GetPosString()
String aString( ScGlobal::GetRscString( STR_PAGE ) );
aString += ' ';
- aString += String::CreateFromInt32(nPageNo+1);
+ aString += OUString::number(nPageNo+1);
if (nTabsTested >= nTabCount)
{
aString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
- aString += String::CreateFromInt32(nTotalPages);
+ aString += OUString::number(nTotalPages);
}
return aString;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 2cc99a59eab2..cc3fcc863a2a 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -458,10 +458,10 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
aHelpStr = ScGlobal::GetRscString( STR_PAGE );
aHelpStr += ' ';
- aHelpStr += String::CreateFromInt32( nPageNo );
+ aHelpStr += OUString::number( nPageNo );
aHelpStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
- aHelpStr += String::CreateFromInt32( nTotalPages );
+ aHelpStr += OUString::number( nTotalPages );
}
else if( nDelta > 0 )
{
@@ -471,10 +471,10 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll )
aHelpStr = ScGlobal::GetRscString( STR_PAGE );
aHelpStr += ' ';
- aHelpStr += String::CreateFromInt32( nPageNo+1 );
+ aHelpStr += OUString::number( nPageNo+1 );
aHelpStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " / " ));
- aHelpStr += String::CreateFromInt32( nTotalPages );
+ aHelpStr += OUString::number( nTotalPages );
}
aRect.Left() = aPos.X() - 8;
@@ -933,9 +933,9 @@ void ScPreviewShell::WriteUserData(String& rData, sal_Bool /* bBrowse */)
// nZoom
// nPageNo
- rData = String::CreateFromInt32(pPreview->GetZoom());
+ rData = OUString::number(pPreview->GetZoom());
rData += (sal_Unicode) SC_USERDATA_SEP;
- rData += String::CreateFromInt32(pPreview->GetPageNo());
+ rData += OUString::number(pPreview->GetPageNo());
}
void ScPreviewShell::ReadUserData(const String& rData, sal_Bool /* bBrowse */)
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 07a360f3b4ff..4aaa6efa0013 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -1421,7 +1421,7 @@ void ScPrintFunc::PrintRowHdr( SCROW nY1, SCROW nY2, long nScrX, long nScrY )
pDev->DrawRect( Rectangle( nPosX,nPosY,nEndX,nEndY ) );
- aText = String::CreateFromInt32( nRow+1 );
+ aText = OUString::number( nRow+1 );
long nTextWidth = pDev->GetTextWidth(aText);
long nTextHeight = pDev->GetTextHeight();
long nAddX = ( nWidth - nTextWidth ) / 2;
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 0deadab02af6..596f990981fd 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1114,7 +1114,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll )
{
aHelpStr = ScGlobal::GetRscString(STR_ROW);
aHelpStr += ' ';
- aHelpStr += String::CreateFromInt32(nScrollPos + 1);
+ aHelpStr += OUString::number(nScrollPos + 1);
// show quicktext always inside sheet area
aRect.Left() = bLayoutRTL ? (aPos.X() + aSize.Width() + 8) : (aPos.X() - 8);
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 07f96f2fee30..2586b9f4b209 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -68,9 +68,9 @@ void ScTabView::ShowRefTip()
String aHelp = ScGlobal::GetRscString( STR_QUICKHELP_REF );
aHelp.SearchAndReplace( rtl::OUString("%1"),
- String::CreateFromInt32(nRows) );
+ OUString::number(nRows) );
aHelp.SearchAndReplace( rtl::OUString("%2"),
- String::CreateFromInt32(nCols) );
+ OUString::number(nCols) );
ScSplitPos eWhich = aViewData.GetActivePart();
Window* pWin = pGridWin[eWhich];
@@ -264,9 +264,9 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ )
SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig
SCROW nRows = nEndY + 1 - aViewData.GetRefStartY();
aHelpStr.SearchAndReplace( rtl::OUString("%1"),
- String::CreateFromInt32(nRows) );
+ OUString::number(nRows) );
aHelpStr.SearchAndReplace( rtl::OUString("%2"),
- String::CreateFromInt32(nCols) );
+ OUString::number(nCols) );
}
else if ( aViewData.GetDelMark( aDelRange ) )
aHelpStr = ScGlobal::GetRscString( STR_QUICKHELP_DELETE );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index acc422f4baac..1cce1ab6ec7b 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2183,10 +2183,10 @@ void ScViewData::WriteUserData(String& rData)
// wenn Zeilen groesser 8192, "+" statt "/"
sal_uInt16 nZoom = (sal_uInt16)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator());
- rData = String::CreateFromInt32( nZoom );
+ rData = OUString::number( nZoom );
rData += '/';
nZoom = (sal_uInt16)((pThisTab->aPageZoomY.GetNumerator() * 100) / pThisTab->aPageZoomY.GetDenominator());
- rData += String::CreateFromInt32( nZoom );
+ rData += OUString::number( nZoom );
rData += '/';
if (bPagebreak)
rData += '1';
@@ -2194,10 +2194,10 @@ void ScViewData::WriteUserData(String& rData)
rData += '0';
rData += ';';
- rData += String::CreateFromInt32( nTabNo );
+ rData += OUString::number( nTabNo );
rData += ';';
rData.AppendAscii(RTL_CONSTASCII_STRINGPARAM( TAG_TABBARWIDTH ));
- rData += String::CreateFromInt32( pView->GetTabBarWidth() );
+ rData += OUString::number( pView->GetTabBarWidth() );
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB i=0; i<nTabCount; i++)
@@ -2215,33 +2215,33 @@ void ScViewData::WriteUserData(String& rData)
}
- rData += String::CreateFromInt32( maTabData[i]->nCurX );
+ rData += OUString::number( maTabData[i]->nCurX );
rData += cTabSep;
- rData += String::CreateFromInt32( maTabData[i]->nCurY );
+ rData += OUString::number( maTabData[i]->nCurY );
rData += cTabSep;
- rData += String::CreateFromInt32( maTabData[i]->eHSplitMode );
+ rData += OUString::number( maTabData[i]->eHSplitMode );
rData += cTabSep;
- rData += String::CreateFromInt32( maTabData[i]->eVSplitMode );
+ rData += OUString::number( maTabData[i]->eVSplitMode );
rData += cTabSep;
if ( maTabData[i]->eHSplitMode == SC_SPLIT_FIX )
- rData += String::CreateFromInt32( maTabData[i]->nFixPosX );
+ rData += OUString::number( maTabData[i]->nFixPosX );
else
- rData += String::CreateFromInt32( maTabData[i]->nHSplitPos );
+ rData += OUString::number( maTabData[i]->nHSplitPos );
rData += cTabSep;
if ( maTabData[i]->eVSplitMode == SC_SPLIT_FIX )
- rData += String::CreateFromInt32( maTabData[i]->nFixPosY );
+ rData += OUString::number( maTabData[i]->nFixPosY );
else
- rData += String::CreateFromInt32( maTabData[i]->nVSplitPos );
+ rData += OUString::number( maTabData[i]->nVSplitPos );
rData += cTabSep;
- rData += String::CreateFromInt32( maTabData[i]->eWhichActive );
+ rData += OUString::number( maTabData[i]->eWhichActive );
rData += cTabSep;
- rData += String::CreateFromInt32( maTabData[i]->nPosX[0] );
+ rData += OUString::number( maTabData[i]->nPosX[0] );
rData += cTabSep;
- rData += String::CreateFromInt32( maTabData[i]->nPosX[1] );
+ rData += OUString::number( maTabData[i]->nPosX[1] );
rData += cTabSep;
- rData += String::CreateFromInt32( maTabData[i]->nPosY[0] );
+ rData += OUString::number( maTabData[i]->nPosY[0] );
rData += cTabSep;
- rData += String::CreateFromInt32( maTabData[i]->nPosY[1] );
+ rData += OUString::number( maTabData[i]->nPosY[1] );
}
}
}