[Libreoffice-commits] core.git: sd/source svx/source svx/workben
Jean-Noël Rouvignac
jn.rouvignac at gmail.com
Fri Feb 22 09:23:39 PST 2013
sd/source/core/drawdoc2.cxx | 2
sd/source/core/drawdoc3.cxx | 2
sd/source/core/sdpage.cxx | 12 ++---
sd/source/core/sdpage2.cxx | 4 -
sd/source/core/stlpool.cxx | 12 ++---
sd/source/filter/eppt/epptso.cxx | 8 +--
sd/source/filter/html/htmlex.cxx | 52 ++++++++++++------------
sd/source/filter/ppt/pptin.cxx | 6 +-
sd/source/filter/xml/sdxmlwrp.cxx | 4 -
sd/source/ui/animations/CustomAnimationPane.cxx | 10 ++--
sd/source/ui/dlg/present.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 2
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/slidesorter/view/SlsToolTip.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/view/drawview.cxx | 6 +-
sd/source/ui/view/drviewsb.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 6 +-
sd/source/ui/view/outlview.cxx | 6 +-
sd/source/ui/view/sdview.cxx | 2
svx/source/dialog/svxruler.cxx | 4 -
svx/source/engine3d/float3d.cxx | 6 +-
svx/source/form/datanavi.cxx | 2
svx/source/form/fmobj.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/gallery2/galbrws1.cxx | 6 +-
svx/source/gallery2/gallery1.cxx | 2
svx/source/gallery2/galtheme.cxx | 4 -
svx/source/sdr/properties/textproperties.cxx | 2
svx/source/stbctrls/zoomctrl.cxx | 4 -
svx/source/tbxctrls/fontworkgallery.cxx | 2
svx/source/tbxctrls/layctrl.cxx | 6 +-
svx/source/tbxctrls/lboxctrl.cxx | 2
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 2
svx/source/xoutdev/xattr.cxx | 6 +-
svx/workben/edittest.cxx | 44 ++++++++++----------
38 files changed, 122 insertions(+), 122 deletions(-)
New commits:
commit 6119e15c8b2b19c6ea3c271fb1c9d7e047902e77
Author: Jean-Noël Rouvignac <jn.rouvignac at gmail.com>
Date: Wed Feb 20 00:20:41 2013 +0100
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 at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index b654cfb..e612831 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -351,7 +351,7 @@ void SdDrawDocument::UpdatePageRelativeURLs(SdPage* pPage, sal_uInt16 nPos, sal_
// update link page number
number += nIncrement;
aURL.Erase (aHashSlide.Len() + 1, aURL.Len() - aHashSlide.Len() - 1);
- aURL += XubString::CreateFromInt32(number);
+ aURL += OUString::number(number);
if (bNotes)
{
aURL += ' ';
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index b18c254..0c2e5e1 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1767,7 +1767,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
// Testnamen bilden
aTest = aName; // Standard, Standard1, Standard2, ...
if (nCount > 0)
- aTest += String::CreateFromInt32( nCount );
+ aTest += OUString::number( nCount );
// gibt's schon eine, die so heisst?
bNotANewName = sal_False;
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index f9187be..24244d2 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -511,7 +511,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
{
String aName(maLayoutName);
aName += sal_Unicode( ' ' );
- aName += String::CreateFromInt32( nLevel );
+ aName += OUString::number( nLevel );
SfxStyleSheet* pSheet = (SfxStyleSheet*)pModel->GetStyleSheetPool()->Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSheet, "Vorlage fuer Gliederungsobjekt nicht gefunden");
if (pSheet)
@@ -595,7 +595,7 @@ SfxStyleSheet* SdPage::GetStyleSheetForPresObj(PresObjKind eObjKind) const
{
aName = GetLayoutName();
aName += sal_Unicode( ' ' );
- aName += String::CreateFromInt32( 1 );
+ aName += OUString::number( 1 );
}
break;
@@ -661,7 +661,7 @@ SdStyleSheet* SdPage::getPresentationStyle( sal_uInt32 nHelpId ) const
if( nNameId == STR_LAYOUT_OUTLINE )
{
aStyleName.Append( sal_Unicode( ' ' ));
- aStyleName.Append( String::CreateFromInt32( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE )));
+ aStyleName.Append( OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE )));
}
SfxStyleSheetBasePool* pStShPool = pModel->GetStyleSheetPool();
@@ -1910,7 +1910,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
for (sal_uInt16 i=1; i<=9; i++)
{
String sLayoutName(aName);
- sLayoutName += String::CreateFromInt32( (sal_Int32)i );
+ sLayoutName += OUString::number( (sal_Int32)i );
SfxStyleSheet* pOutlineSheet = (SfxStyleSheet*)((SdDrawDocument*) pModel)->GetStyleSheetPool()->Find(sLayoutName, SD_STYLE_FAMILY_MASTERPAGE);
if (pOutlineSheet)
@@ -2063,7 +2063,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj,
// Neue Vorlage zuweisen
String aName(rPage.GetLayoutName());
aName += sal_Unicode( ' ' );
- aName += String::CreateFromInt32( nLevel );
+ aName += OUString::number( nLevel );
SfxStyleSheet* pSheet = static_cast<SfxStyleSheet*>( pModel->GetStyleSheetPool()->Find(aName, SD_STYLE_FAMILY_MASTERPAGE) );
if (pSheet)
@@ -2523,7 +2523,7 @@ const String& SdPage::GetName() const
// if the document has number none as a formating
// for page numbers we still default to arabic numbering
// to keep the default page names unique
- aCreatedPageName += String::CreateFromInt32( (sal_Int32)nNum );
+ aCreatedPageName += OUString::number( (sal_Int32)nNum );
}
else
{
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 13fda31..b4e5c40 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -163,9 +163,9 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
aFullName = maLayoutName;
aOldFullName = aOldLayoutName;
aFullName += sal_Unicode( ' ' );
- aFullName += String::CreateFromInt32( (sal_Int32) (i <= 0 ) ? 1 : i + 1);
+ aFullName += OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1);
aOldFullName += sal_Unicode( ' ' );
- aOldFullName += String::CreateFromInt32( (sal_Int32) (i <= 0 ) ? 1 : i + 1 );
+ aOldFullName += OUString::number( (sal_Int32) (i <= 0 ) ? 1 : i + 1 );
pSheet = pStShPool->Find(aOldFullName, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSheet, "alte Gliederungsvorlage nicht gefunden");
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 26fb299..5f7671a 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -146,7 +146,7 @@ void SdStyleSheetPool::CreateOutlineSheetList (const String& rLayoutName, std::v
{
String aFullName(aName);
aFullName.Append( sal_Unicode( ' ' ));
- aFullName.Append( String::CreateFromInt32( (sal_Int32)nSheet ));
+ aFullName.Append( OUString::number( (sal_Int32)nSheet ));
SfxStyleSheetBase* pSheet = Find(aFullName, SD_STYLE_FAMILY_MASTERPAGE);
if (pSheet)
@@ -204,7 +204,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
{
String aLevelName(aName);
aLevelName.Append( sal_Unicode( ' ' ));
- aLevelName.Append( String::CreateFromInt32( sal_Int32( nLevel )));
+ aLevelName.Append( OUString::number( sal_Int32( nLevel )));
aLevelName.Insert(aPrefix, 0);
@@ -306,7 +306,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
{
String aLevelName(aName);
aLevelName.Append( sal_Unicode( ' ' ));
- aLevelName.Append( String::CreateFromInt32( sal_Int32( nLevel )));
+ aLevelName.Append( OUString::number( sal_Int32( nLevel )));
aLevelName.Insert(aPrefix, 0);
@@ -731,7 +731,7 @@ void SdStyleSheetPool::CreateLayoutSheetNames(const String& rLayoutName, std::ve
aStr = String( aPrefix );
aStr.Append(aName);
aStr.Append( sal_Unicode( ' ' ));
- aStr.Append( String::CreateFromInt32( sal_Int32( nLevel )));
+ aStr.Append( OUString::number( sal_Int32( nLevel )));
aNameList.push_back(aStr);
}
@@ -847,7 +847,7 @@ void SdStyleSheetPool::CreatePseudosIfNecessary()
{
String aLevelName(aName);
aLevelName.Append( sal_Unicode( ' ' ));
- aLevelName.Append( String::CreateFromInt32( sal_Int32( nLevel )));
+ aLevelName.Append( OUString::number( sal_Int32( nLevel )));
if( (pSheet = Find(aLevelName, SD_STYLE_FAMILY_PSEUDO)) == 0 )
{
@@ -943,7 +943,7 @@ void SdStyleSheetPool::UpdateStdNames()
if( nNameId == STR_PSEUDOSHEET_OUTLINE )
{
aNewName.Append( sal_Unicode( ' ' ));
- aNewName.Append( String::CreateFromInt32( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE )));
+ aNewName.Append( OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE )));
}
}
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 2986275..44bacaf 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1222,9 +1222,9 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
nPageIndex = pIter - maSlideNameList.begin();
aPageUrl = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nPageIndex));
aPageUrl.Append( rtl::OUString( "," ) );
- aPageUrl.Append( String::CreateFromInt32( nPageIndex + 1 ) );
+ aPageUrl.Append( OUString::number( nPageIndex + 1 ) );
aPageUrl.Append( rtl::OUString( ",Slide " ) );
- aPageUrl.Append( String::CreateFromInt32( nPageIndex + 1 ) );
+ aPageUrl.Append( OUString::number( nPageIndex + 1 ) );
}
}
sal_uInt32 nHyperId(0);
@@ -2058,9 +2058,9 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
String aEmpty;
String aHyperString = rtl::OUString::valueOf(static_cast<sal_Int32>(256 + nIndex));
aHyperString.Append( rtl::OUString( "," ) );
- aHyperString.Append( String::CreateFromInt32( nIndex + 1 ) );
+ aHyperString.Append( OUString::number( nIndex + 1 ) );
aHyperString.Append( rtl::OUString( ",Slide " ) );
- aHyperString.Append( String::CreateFromInt32( nIndex + 1 ) );
+ aHyperString.Append( OUString::number( nIndex + 1 ) );
nHyperLinkID = ImplInsertBookmarkURL( aHyperString, 1 | ( nIndex << 8 ) | ( 1 << 31 ), aBookmark, aEmpty, aEmpty, aHyperString );
}
}
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 57dfb57..943645d 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1553,7 +1553,7 @@ bool HtmlExport::CreateHtmlForPresPages()
if( nSdPage < (mnSdPageCount-1) || bEndless )
{
aStr.AppendAscii( "<meta http-equiv=\"refresh\" content=\"" );
- aStr += String::CreateFromInt32(nSecs);
+ aStr += OUString::number(nSecs);
aStr.AppendAscii( "; URL=" );
int nPage = nSdPage + 1;
@@ -2051,7 +2051,7 @@ bool HtmlExport::CreateOutlinePages()
aStr.AppendAscii( "<div align=\"left\">" );
String aLink( RTL_CONSTASCII_USTRINGPARAM( "JavaScript:parent.NavigateAbs(" ) );
- aLink += String::CreateFromInt32(nSdPage);
+ aLink += OUString::number(nSdPage);
aLink.Append( sal_Unicode(')') );
String aTitle = CreateTextForTitle(pOutliner,pPage, maBackColor);
@@ -2107,14 +2107,14 @@ void HtmlExport::CreateFileNames()
else
{
pName = new String( RTL_CONSTASCII_USTRINGPARAM("img") );
- *pName += String::CreateFromInt32(nSdPage);
+ *pName += OUString::number(nSdPage);
*pName += maHTMLExtension;
}
mpHTMLFiles[nSdPage] = pName;
pName = new String( RTL_CONSTASCII_USTRINGPARAM("img") );
- *pName += String::CreateFromInt32(nSdPage);
+ *pName += OUString::number(nSdPage);
if( meFormat==FORMAT_GIF )
pName->AppendAscii( ".gif" );
else if( meFormat==FORMAT_JPG )
@@ -2125,7 +2125,7 @@ void HtmlExport::CreateFileNames()
mpImageFiles[nSdPage] = pName;
pName = new String( RTL_CONSTASCII_USTRINGPARAM("thumb") );
- *pName += String::CreateFromInt32(nSdPage);
+ *pName += OUString::number(nSdPage);
if( meFormat!=FORMAT_JPG )
pName->AppendAscii( ".png" );
else
@@ -2134,7 +2134,7 @@ void HtmlExport::CreateFileNames()
mpThumbnailFiles[nSdPage] = pName;
pName = new String( RTL_CONSTASCII_USTRINGPARAM("text"));
- *pName += String::CreateFromInt32(nSdPage);
+ *pName += OUString::number(nSdPage);
*pName += maHTMLExtension;
mpTextFiles[nSdPage] = pName;
@@ -2265,7 +2265,7 @@ bool HtmlExport::CreateFrames()
aStr.AppendAscii( "<script type=\"text/javascript\">\r\n<!--\r\n" );
aStr.AppendAscii( "var nCurrentPage = 0;\r\nvar nPageCount = " );
- aStr += String::CreateFromInt32(mnSdPageCount);
+ aStr += OUString::number(mnSdPageCount);
aStr.AppendAscii( ";\r\n\r\n" );
String aFunction;
@@ -2301,7 +2301,7 @@ bool HtmlExport::CreateFrames()
aStr.AppendAscii( "</head>\r\n" );
aStr.AppendAscii( "<frameset cols=\"*," );
- aStr += String::CreateFromInt32((mnWidthPixel + 16));
+ aStr += OUString::number((mnWidthPixel + 16));
aStr.AppendAscii( "\">\r\n" );
if(mbImpress)
{
@@ -2319,7 +2319,7 @@ bool HtmlExport::CreateFrames()
if(mbNotes)
{
aStr.AppendAscii( " <frameset rows=\"42," );
- aStr += String::CreateFromInt32((int)((double)mnWidthPixel * 0.75) + 16);
+ aStr += OUString::number((int)((double)mnWidthPixel * 0.75) + 16);
aStr.AppendAscii( ",*\">\r\n" );
}
else
@@ -2429,7 +2429,7 @@ bool HtmlExport::CreateNavBarFrames()
if(nFile != 2 && mnSdPageCount > 1)
{
String aLink(RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.NavigateAbs("));
- aLink += String::CreateFromInt32(mnSdPageCount-1);
+ aLink += OUString::number(mnSdPageCount-1);
aLink.AppendAscii( ")" );
aButton = CreateLink( aLink, aButton);
}
@@ -2467,7 +2467,7 @@ bool HtmlExport::CreateNavBarFrames()
aStr.AppendAscii( "</body>\r\n</html>" );
String aFileName( RTL_CONSTASCII_USTRINGPARAM("navbar") );
- aFileName += String::CreateFromInt32(nFile);
+ aFileName += OUString::number(nFile);
bOk = WriteHtml( aFileName, true, aStr );
@@ -2730,13 +2730,13 @@ String HtmlExport::CreateImage( const String& aImage, const String& aAltText,
if(nWidth > -1)
{
aStr.AppendAscii( " width=" );
- aStr += String::CreateFromInt32(nWidth);
+ aStr += OUString::number(nWidth);
}
if(nHeight > -1)
{
aStr.AppendAscii( " height=" );
- aStr += String::CreateFromInt32(nHeight);
+ aStr += OUString::number(nHeight);
}
aStr.Append(sal_Unicode('>'));
@@ -2771,11 +2771,11 @@ String HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius,
{
String aStr( RTL_CONSTASCII_USTRINGPARAM("<area shape=\"circle\" alt=\"\" coords=\"" ));
- aStr += String::CreateFromInt32(nCenterX);
+ aStr += OUString::number(nCenterX);
aStr.Append(sal_Unicode(','));
- aStr += String::CreateFromInt32(nCenterY);
+ aStr += OUString::number(nCenterY);
aStr.Append(sal_Unicode(','));
- aStr += String::CreateFromInt32(nRadius);
+ aStr += OUString::number(nRadius);
aStr.AppendAscii( "\" href=\"" );
aStr += StringToURL(rHRef);
aStr.AppendAscii( "\">\n" );
@@ -2811,9 +2811,9 @@ String HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPoly
aPnt.X() = (long)(aPnt.X() * fFactor);
aPnt.Y() = (long)(aPnt.Y() * fFactor);
- aStr += String::CreateFromInt32(aPnt.X());
+ aStr += OUString::number(aPnt.X());
aStr.Append(sal_Unicode(','));
- aStr += String::CreateFromInt32(aPnt.Y());
+ aStr += OUString::number(aPnt.Y());
if (nPoint < nNoOfPoints - 1)
aStr.Append( sal_Unicode(',') );
@@ -2834,13 +2834,13 @@ String HtmlExport::CreateHTMLRectArea( const Rectangle& rRect,
{
String aStr( RTL_CONSTASCII_USTRINGPARAM("<area shape=\"rect\" alt=\"\" coords=\"") );
- aStr += String::CreateFromInt32(rRect.Left());
+ aStr += OUString::number(rRect.Left());
aStr.Append(sal_Unicode(','));
- aStr += String::CreateFromInt32(rRect.Top());
+ aStr += OUString::number(rRect.Top());
aStr.Append(sal_Unicode(','));
- aStr += String::CreateFromInt32(rRect.Right());
+ aStr += OUString::number(rRect.Right());
aStr.Append(sal_Unicode(','));
- aStr += String::CreateFromInt32(rRect.Bottom());
+ aStr += OUString::number(rRect.Bottom());
aStr.AppendAscii( "\" href=\"" );
aStr += StringToURL(rHRef);
aStr.AppendAscii( "\">\n" );
@@ -2868,7 +2868,7 @@ String HtmlExport::CreatePageURL( sal_uInt16 nPgNum )
if(mbFrames)
{
String aUrl( RTL_CONSTASCII_USTRINGPARAM("JavaScript:parent.NavigateAbs("));
- aUrl += String::CreateFromInt32(nPgNum);
+ aUrl += OUString::number(nPgNum);
aUrl.Append(sal_Unicode(')'));
return aUrl;
}
@@ -2924,8 +2924,8 @@ bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const S
aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$3")), maCGIPath );
- aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$4")), String::CreateFromInt32(mnWidthPixel) );
- aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$5")), String::CreateFromInt32(mnHeightPixel) );
+ aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$4")), OUString::number(mnWidthPixel) );
+ aScript.SearchAndReplaceAll( String(RTL_CONSTASCII_USTRINGPARAM("$$5")), OUString::number(mnHeightPixel) );
String aDest( rPath );
@@ -3005,7 +3005,7 @@ bool HtmlExport::CreateImageFileList()
String aStr;
for( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
- aStr += String::CreateFromInt32( nSdPage + 1 );
+ aStr += OUString::number( nSdPage + 1 );
aStr.Append(sal_Unicode(';'));
aStr += maURLPath;
aStr += *mpImageFiles[nSdPage];
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 625f7a8..033355a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -605,7 +605,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( ePgKind == PK_STANDARD )
{ // Standardseite: Neues Praesentationslayout erzeugen
aLayoutName = String( SdResId( STR_LAYOUT_DEFAULT_TITLE_NAME ) );
- aLayoutName += String::CreateFromInt32( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) );
+ aLayoutName += OUString::number( (sal_Int32)( ( nMasterNum + 1 ) / 2 - 1 ) );
( (SdStyleSheetPool*)mpDoc->GetStyleSheetPool() )->CreateLayoutStyleSheets( aLayoutName );
}
else // Notizseite: Praesentationslayout von der Standardseite verwenden
@@ -648,7 +648,7 @@ sal_Bool ImplSdPPTImport::Import()
{
String aName( pPage->GetLayoutName() );
aName.Append( (sal_Unicode)( ' ' ) );
- aName.Append( String::CreateFromInt32( nLevel + 1 ) );
+ aName.Append( OUString::number( nLevel + 1 ) );
SfxStyleSheet* pOutlineSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find( aName, SD_STYLE_FAMILY_MASTERPAGE );
DBG_ASSERT( pOutlineSheet, "Vorlage fuer Gliederungsobjekt nicht gefunden" );
if ( pOutlineSheet )
@@ -2205,7 +2205,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
String aName( pPage->GetLayoutName() );
aName.Append( (sal_Unicode)( ' ' ) );
- aName.Append( String::CreateFromInt32( nLevel ) );
+ aName.Append( OUString::number( nLevel ) );
pSheet = (SfxStyleSheet*)mpDoc->GetStyleSheetPool()->Find( aName, SD_STYLE_FAMILY_MASTERPAGE );
if ( pSheet )
pText->StartListening( *pSheet );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 4020a62..08a9191 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -276,9 +276,9 @@ sal_Int32 ReadThroughComponent(
OSL_FAIL(aError.getStr());
#endif
- String sErr( String::CreateFromInt32( r.LineNumber ));
+ String sErr( OUString::number( r.LineNumber ));
sErr += ',';
- sErr += String::CreateFromInt32( r.ColumnNumber );
+ sErr += OUString::number( r.ColumnNumber );
if( rStreamName.Len() )
{
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index de80335..d1e29d0 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -136,11 +136,11 @@ void fillRepeatComboBox( ComboBox* pBox )
String aNone( SdResId( STR_CUSTOMANIMATION_REPEAT_NONE ) );
pBox->SetEntryData( pBox->InsertEntry( aNone ), (void*)((sal_Int32)0) );
- pBox->SetEntryData( pBox->InsertEntry( String::CreateFromInt32( 2 ) ), (void*)((sal_Int32)1) );
- pBox->SetEntryData( pBox->InsertEntry( String::CreateFromInt32( 3 ) ), (void*)((sal_Int32)3) );
- pBox->SetEntryData( pBox->InsertEntry( String::CreateFromInt32( 4 ) ), (void*)((sal_Int32)4) );
- pBox->SetEntryData( pBox->InsertEntry( String::CreateFromInt32( 5 ) ), (void*)((sal_Int32)5) );
- pBox->SetEntryData( pBox->InsertEntry( String::CreateFromInt32( 10 ) ), (void*)((sal_Int32)10) );
+ pBox->SetEntryData( pBox->InsertEntry( OUString::number( 2 ) ), (void*)((sal_Int32)1) );
+ pBox->SetEntryData( pBox->InsertEntry( OUString::number( 3 ) ), (void*)((sal_Int32)3) );
+ pBox->SetEntryData( pBox->InsertEntry( OUString::number( 4 ) ), (void*)((sal_Int32)4) );
+ pBox->SetEntryData( pBox->InsertEntry( OUString::number( 5 ) ), (void*)((sal_Int32)5) );
+ pBox->SetEntryData( pBox->InsertEntry( OUString::number( 10 ) ), (void*)((sal_Int32)10) );
String aUntilClick( SdResId( STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK ) );
pBox->SetEntryData( pBox->InsertEntry( aUntilClick ), (void*)((sal_Int32)-1) );
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 1e1a812..8f91e38 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -201,7 +201,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
for( sal_Int32 nDisplay = 0; nDisplay < mnMonitors; nDisplay++ )
{
String aName( nDisplay == nExternalIndex ? msExternalMonitor : msMonitor );
- const String aNumber( String::CreateFromInt32( nDisplay + 1 ) );
+ const String aNumber( OUString::number( nDisplay + 1 ) );
aName.SearchAndReplace( sPlaceHolder, aNumber );
maLBMonitor.InsertEntry( aName );
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 66b8002..0d06d5d 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -292,7 +292,7 @@ String SdPageObjsTLB::GetObjectName(
&& pObject!=NULL)
{
aRet = SD_RESSTR(STR_NAVIGATOR_SHAPE_BASE_NAME);
- aRet.SearchAndReplaceAscii("%1", String::CreateFromInt32(pObject->GetOrdNum() + 1));
+ aRet.SearchAndReplaceAscii("%1", OUString::number(pObject->GetOrdNum() + 1));
}
return aRet;
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index ee63054..d25059a 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -658,7 +658,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
pDocliner->Insert( pOutliner->GetText(pSourcePara), nTargetPos, nDepth );
String aStyleSheetName( pStyleSheet->GetName() );
aStyleSheetName.Erase( aStyleSheetName.Len()-1, 1 );
- aStyleSheetName += String::CreateFromInt32( nDepth <= 0 ? 1 : nDepth+1 );
+ aStyleSheetName += OUString::number( nDepth <= 0 ? 1 : nDepth+1 );
SfxStyleSheetBasePool* pStylePool = mpDoc->GetStyleSheetPool();
SfxStyleSheet* pOutlStyle = (SfxStyleSheet*) pStylePool->Find( aStyleSheetName, pStyleSheet->GetFamily() );
pDocliner->SetStyleSheet( nTargetPos, pOutlStyle );
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 2c2c845..fe790dd 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -456,7 +456,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
for( sal_uInt16 n = (sal_uInt16)(ePO - PO_OUTLINE_1 + 2); n < 10; n++ )
{
String aName( sStyleName );
- aName.Append( String::CreateFromInt32( (sal_Int32) n ));
+ aName.Append( OUString::number( (sal_Int32) n ));
SfxStyleSheetBase* pSheet = pSSPool->Find( aName, SD_STYLE_FAMILY_PSEUDO);
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 067a019..f28aa53 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -76,7 +76,7 @@ void ToolTip::SetPage (const model::SharedPageDescriptor& rpDescriptor)
if (sHelpText.isEmpty())
{
sHelpText = String(SdResId(STR_PAGE));
- sHelpText += String::CreateFromInt32(mpDescriptor->GetPageIndex()+1);
+ sHelpText += OUString::number(mpDescriptor->GetPageIndex()+1);
}
msDefaultHelpText = sHelpText;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index a5cbde3..b490229 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2644,7 +2644,7 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
i++;
aPrefix = aStdPrefix;
aPrefix += sal_Unicode( ' ' );
- aPrefix += String::CreateFromInt32( i );
+ aPrefix += OUString::number( i );
}
} while( !bUnique );
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index d8d1d66..ce740e7 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -205,7 +205,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
sal_Int16 nDepth = pOutliner->GetDepth( (sal_uInt16) nParaPos );
String aName(rPage.GetLayoutName());
aName += (sal_Unicode)(' ');
- aName += String::CreateFromInt32( (nDepth <= 0) ? 1 : nDepth + 1 );
+ aName += OUString::number( (nDepth <= 0) ? 1 : nDepth + 1 );
SfxStyleSheet* pSheet = (SfxStyleSheet*)pStShPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSheet, "StyleSheet not found");
@@ -232,7 +232,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
{
String aSheetName(rPage.GetLayoutName());
aSheetName += (sal_Unicode)(' ');
- aSheetName += String::CreateFromInt32( nChild <= 0 ? 1 : nChild + 1 );
+ aSheetName += OUString::number( nChild <= 0 ? 1 : nChild + 1 );
SfxStyleSheet* pOutlSheet = static_cast< SfxStyleSheet* >(pStShPool->Find(aSheetName, SD_STYLE_FAMILY_MASTERPAGE));
if( pOutlSheet )
@@ -303,7 +303,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
{
String aName(rPage.GetLayoutName());
aName += (sal_Unicode)(' ');
- aName += String::CreateFromInt32( (sal_Int32)nLevel );
+ aName += OUString::number( (sal_Int32)nLevel );
SfxStyleSheet* pSheet = (SfxStyleSheet*)pStShPool->
Find(aName, SD_STYLE_FAMILY_MASTERPAGE);
DBG_ASSERT(pSheet, "StyleSheet not found");
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 87e3d1c..a2f524a 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -86,7 +86,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq)
sal_uInt16 nLayerCnt = rLayerAdmin.GetLayerCount();
sal_uInt16 nLayer = nLayerCnt - 2 + 1;
String aLayerName ( SdResId(STR_LAYER) ), aLayerTitle, aLayerDesc;
- aLayerName += String::CreateFromInt32( (sal_Int32)nLayer );
+ aLayerName += OUString::number( (sal_Int32)nLayer );
sal_Bool bIsVisible = sal_False;
sal_Bool bIsLocked = sal_False;
sal_Bool bIsPrintable = sal_False;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 7e5e616..7ee2479 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1441,9 +1441,9 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet)
aPageStr = String(SdResId( STR_SD_PAGE ));
aPageStr += sal_Unicode(' ');
- aPageStr += String::CreateFromInt32( (sal_Int32)(nPos + 1) ); // sal_uLong -> sal_Int32
+ aPageStr += OUString::number( (sal_Int32)(nPos + 1) ); // sal_uLong -> sal_Int32
aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " ));
- aPageStr += String::CreateFromInt32( nPageCount );
+ aPageStr += OUString::number( nPageCount );
aLayoutStr = pPage->GetLayoutName();
aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
@@ -1997,7 +1997,7 @@ sal_uLong OutlineViewShell::Read(SvStream& rInput, const String& rBaseURL, sal_u
pOutl->SetDepth( pOutl->GetParagraph( nPara ), nDepth - 1 );
String aStyleSheetName( pOutlSheet->GetName() );
aStyleSheetName.Erase( aStyleSheetName.Len() - 1, 1 );
- aStyleSheetName += String::CreateFromInt32( nDepth );
+ aStyleSheetName += OUString::number( nDepth );
SfxStyleSheetBasePool* pStylePool = GetDoc()->GetStyleSheetPool();
SfxStyleSheet* pStyle = (SfxStyleSheet*) pStylePool->Find( aStyleSheetName, pOutlSheet->GetFamily() );
DBG_ASSERT( pStyle, "AutoStyleSheetName - Style not found!" );
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index fde0aae..50d91c1 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -821,7 +821,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
{
String aNewStyleSheetName( pStyleSheet->GetName() );
aNewStyleSheetName.Erase( aNewStyleSheetName.Len()-1, 1 );
- aNewStyleSheetName += String::CreateFromInt32( nDepth+1 );
+ aNewStyleSheetName += OUString::number( nDepth+1 );
SfxStyleSheetBasePool* pStylePool = mrDoc.GetStyleSheetPool();
pStyleSheet = (SfxStyleSheet*) pStylePool->Find( aNewStyleSheetName, pStyleSheet->GetFamily() );
}
@@ -1866,7 +1866,7 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo)
aNewFont.SetOrientation( bVertical ? 2700 : 0 );
aNewFont.SetColor( COL_AUTO );
pInfo->mpOutDev->SetFont( aNewFont );
- String aPageText = String::CreateFromInt32( nPage );
+ String aPageText = OUString::number( nPage );
Size aTextSz;
aTextSz.Width() = pInfo->mpOutDev->GetTextWidth( aPageText );
aTextSz.Height() = pInfo->mpOutDev->GetTextHeight();
@@ -1958,7 +1958,7 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
{
String aStyleSheetName( pStyle->GetName() );
aStyleSheetName.Erase( aStyleSheetName.Len() - 1, 1 );
- aStyleSheetName += String::CreateFromInt32( nDepth );
+ aStyleSheetName += OUString::number( nDepth );
pStyle = static_cast<SfxStyleSheet*>( pStylePool->Find( aStyleSheetName, pStyle->GetFamily() ) );
DBG_ASSERT( pStyle, "sd::OutlineView::OnEndPasteOrDrop(), Style not found!" );
}
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index f669db2..7159b29 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1250,7 +1250,7 @@ void View::OnEndPasteOrDrop( PasteOrDropInfos* pInfos )
{
String aStyleSheetName( pStyleSheet->GetName() );
aStyleSheetName.Erase( aStyleSheetName.Len() - 1, 1 );
- aStyleSheetName += String::CreateFromInt32( nDepth );
+ aStyleSheetName += OUString::number( nDepth );
pStyle = static_cast<SfxStyleSheet*>( pStylePool->Find( aStyleSheetName, pStyleSheet->GetFamily() ) );
DBG_ASSERT( pStyle, "sd::View::OnEndPasteOrDrop(), Style not found!" );
}
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index f94e86b..e9b3add 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 7ab244a..3304d22 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 f38c616..fe5d9fa 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 75f10fc..82bcd0c 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 b4b1e6c..e9b0a28 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 52ab617..77e1eaa 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 a6bb21c..628d344 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 183aa34..1a09549 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 4803bbc..e4b7f5f 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 74d73d2..8ad0c2e 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 075e3c8..a35262f 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 6ed4c36..ff5bbc7 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 15ee615..cbdbbfa 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 d1467bf..6efefc7 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 33a2df5..09ca1d9 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 3607d5c..26bc642 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 );
}
}
diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx
index eff9f1d..026b7d8 100644
--- a/svx/workben/edittest.cxx
+++ b/svx/workben/edittest.cxx
@@ -565,7 +565,7 @@ EditMainWindow::EditMainWindow() :
void EditMainWindow::SetTitle()
{
String aHeading( String( RTL_CONSTASCII_USTRINGPARAM( "SvEdit! - Zoom " ) ) );
- aHeading += String::CreateFromInt32(nZoom);
+ aHeading += OUString::number(nZoom);
aHeading += '%';
EditEngine* pEditEngine = aViewWin.GetEditView()->GetEditEngine();
if ( pEditEngine->GetControlWord() & EE_CNTRL_STRETCHING )
@@ -573,9 +573,9 @@ void EditMainWindow::SetTitle()
USHORT nX, nY;
pEditEngine->GetGlobalCharStretching( nX, nY );
aHeading += String( RTL_CONSTASCII_USTRINGPARAM( ", Stretch=(" ) );
- aHeading += String::CreateFromInt32(nX);
+ aHeading += OUString::number(nX);
aHeading += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
- aHeading += String::CreateFromInt32(nY);
+ aHeading += OUString::number(nY);
aHeading += ')';
}
SetText( aHeading );
@@ -1118,7 +1118,7 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++)
{
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\n" ) );
- aDebStr += String::CreateFromInt32( nWhich );
+ aDebStr += OUString::number( nWhich );
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\t" ) );
if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF )
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "---" ) );
@@ -1131,25 +1131,25 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
{
case EE_PARA_LRSPACE:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FI=" ) );
- aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst() );
+ aDebStr += OUString::number( ((SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst() );
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", LI=" ) );
- aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetTxtLeft() );
+ aDebStr += OUString::number( ((SvxLRSpaceItem&)rItem).GetTxtLeft() );
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", RI=" ) );
- aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetRight() );
+ aDebStr += OUString::number( ((SvxLRSpaceItem&)rItem).GetRight() );
break;
case EE_PARA_ULSPACE:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SB=" ) );
- aDebStr += String::CreateFromInt32( ((SvxULSpaceItem&)rItem).GetUpper() );
+ aDebStr += OUString::number( ((SvxULSpaceItem&)rItem).GetUpper() );
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", SA=" ) );
- aDebStr += String::CreateFromInt32( ((SvxULSpaceItem&)rItem).GetLower() );
+ aDebStr += OUString::number( ((SvxULSpaceItem&)rItem).GetLower() );
break;
case EE_PARA_SBL:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SBL=" ) );
- aDebStr += String::CreateFromInt32( ((SvxLineSpacingItem&)rItem).GetInterLineSpace() );
+ aDebStr += OUString::number( ((SvxLineSpacingItem&)rItem).GetInterLineSpace() );
break;
case EE_PARA_JUST:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SvxAdust=" ) );
- aDebStr += String::CreateFromInt32( (USHORT)((SvxAdjustItem&)rItem).GetAdjust() );
+ aDebStr += OUString::number( (USHORT)((SvxAdjustItem&)rItem).GetAdjust() );
break;
case EE_PARA_TABS:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Tabs = ?" ) );
@@ -1158,11 +1158,11 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
{
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Color= " ) );
Color aColor( ((SvxColorItem&)rItem).GetValue() );
- aDebStr += String::CreateFromInt32( aColor.GetRed() );
+ aDebStr += OUString::number( aColor.GetRed() );
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
- aDebStr += String::CreateFromInt32( aColor.GetGreen() );
+ aDebStr += OUString::number( aColor.GetGreen() );
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) );
- aDebStr += String::CreateFromInt32( aColor.GetBlue() );
+ aDebStr += OUString::number( aColor.GetBlue() );
}
break;
case EE_CHAR_FONTINFO:
@@ -1171,35 +1171,35 @@ IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p )
break;
case EE_CHAR_FONTHEIGHT:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Groesse=" ) );
- aDebStr += String::CreateFromInt32( ((SvxFontHeightItem&)rItem).GetHeight() );
+ aDebStr += OUString::number( ((SvxFontHeightItem&)rItem).GetHeight() );
break;
case EE_CHAR_WEIGHT:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontWeight=" ) );
- aDebStr += String::CreateFromInt32( ((SvxWeightItem&)rItem).GetWeight() );
+ aDebStr += OUString::number( ((SvxWeightItem&)rItem).GetWeight() );
break;
case EE_CHAR_UNDERLINE:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontUnderline=" ) );
- aDebStr += String::CreateFromInt32( ((SvxUnderlineItem&)rItem).GetLineStyle() );
+ aDebStr += OUString::number( ((SvxUnderlineItem&)rItem).GetLineStyle() );
break;
case EE_CHAR_WLM:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "WordLineMode=" ) );
- aDebStr += String::CreateFromInt32( ((SvxWordLineModeItem&)rItem).GetValue() );
+ aDebStr += OUString::number( ((SvxWordLineModeItem&)rItem).GetValue() );
break;
case EE_CHAR_STRIKEOUT:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontStrikeout=" ) );
- aDebStr += String::CreateFromInt32( ((SvxCrossedOutItem&)rItem).GetStrikeout() );
+ aDebStr += OUString::number( ((SvxCrossedOutItem&)rItem).GetStrikeout() );
break;
case EE_CHAR_ITALIC:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontPosture=" ) );
- aDebStr += String::CreateFromInt32( ((SvxPostureItem&)rItem).GetPosture() );
+ aDebStr += OUString::number( ((SvxPostureItem&)rItem).GetPosture() );
break;
case EE_CHAR_OUTLINE:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontOutline=" ) );
- aDebStr += String::CreateFromInt32( ((SvxContourItem&)rItem).GetValue() );
+ aDebStr += OUString::number( ((SvxContourItem&)rItem).GetValue() );
break;
case EE_CHAR_SHADOW:
aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontShadowed=" ) );
- aDebStr += String::CreateFromInt32( ((SvxShadowedItem&)rItem).GetValue() );
+ aDebStr += OUString::number( ((SvxShadowedItem&)rItem).GetValue() );
break;
}
}
More information about the Libreoffice-commits
mailing list