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 /sd | |
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 'sd')
-rw-r--r-- | sd/source/core/drawdoc2.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/drawdoc3.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/sdpage.cxx | 12 | ||||
-rw-r--r-- | sd/source/core/sdpage2.cxx | 4 | ||||
-rw-r--r-- | sd/source/core/stlpool.cxx | 12 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 8 | ||||
-rw-r--r-- | sd/source/filter/html/htmlex.cxx | 52 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 6 | ||||
-rw-r--r-- | sd/source/filter/xml/sdxmlwrp.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/dlg/present.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/fuinsfil.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/func/futempl.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsToolTip.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/drawview.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsb.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/sdview.cxx | 2 |
21 files changed, 73 insertions, 73 deletions
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index b654cfb98d28..e6128312dce7 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 b18c254f009f..0c2e5e12b4b1 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 f9187be4988d..24244d2ec159 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 13fda3116685..b4e5c40c13e5 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 26fb29928c57..5f7671a714ab 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 29862752910a..44bacaff1e59 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 57dfb57fbe02..943645dc6522 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 625f7a8108a1..033355a9c961 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 4020a628889e..08a9191af5a7 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 de8033521715..d1e29d0545c1 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 1e1a8125cd10..8f91e387aee6 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 66b80029efd4..0d06d5d15b59 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 ee6305474d9b..d25059a20d6b 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 2c2c845f9837..fe790dd2d86c 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 067a019afccc..f28aa53b26a0 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 a5cbde331e59..b4902298f924 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 d8d1d66d448f..ce740e74cafb 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 87e3d1c1af12..a2f524ac7819 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 7e5e616abf36..7ee2479e8622 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 fde0aae0360b..50d91c1c3d67 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 f669db265a82..7159b294fc3b 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!" ); } |