diff options
100 files changed, 263 insertions, 263 deletions
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 197836c63344..45d39a971b41 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1446,9 +1446,9 @@ sal_Bool SwCrsrShell::GetContentAtPos( const Point& rPt, rCntntAtPos.sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Pos: (" )); - rCntntAtPos.sStr += String::CreateFromInt32( aPos.nNode.GetIndex()); + rCntntAtPos.sStr += OUString::number( aPos.nNode.GetIndex()); rCntntAtPos.sStr += ':'; - rCntntAtPos.sStr += String::CreateFromInt32( aPos.nContent.GetIndex()); + rCntntAtPos.sStr += OUString::number( aPos.nContent.GetIndex()); rCntntAtPos.sStr += ')'; rCntntAtPos.sStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "\nAbs.Vorl.: " )); // translation *might be* "paragraph template" diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 2298540c2462..41d47d37fa6b 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -257,7 +257,7 @@ static const String lcl_dbg_out(const SfxPoolItem & rItem) if (GetItemWhichMap().find(rItem.Which()) != GetItemWhichMap().end()) aStr += GetItemWhichMap()[rItem.Which()]; else - aStr += String::CreateFromInt32(rItem.Which()); + aStr += OUString::number(rItem.Which()); aStr += String(" ]", RTL_TEXTENCODING_ASCII_US); @@ -313,9 +313,9 @@ static const String lcl_dbg_out(const SwTxtAttr & rAttr) { String aStr("[ ", RTL_TEXTENCODING_ASCII_US); - aStr += String::CreateFromInt32(*rAttr.GetStart()); + aStr += OUString::number(*rAttr.GetStart()); aStr += String("->", RTL_TEXTENCODING_ASCII_US); - aStr += String::CreateFromInt32(*rAttr.GetEnd()); + aStr += OUString::number(*rAttr.GetEnd()); aStr += String(" ", RTL_TEXTENCODING_ASCII_US); aStr += lcl_dbg_out(rAttr.GetAttr()); @@ -354,11 +354,11 @@ static String lcl_dbg_out(const SwPosition & rPos) { String aStr("( ", RTL_TEXTENCODING_ASCII_US); - aStr += String::CreateFromInt32(rPos.nNode.GetIndex()); + aStr += OUString::number(rPos.nNode.GetIndex()); aStr += String(", ", RTL_TEXTENCODING_ASCII_US); - aStr += String::CreateFromInt32(rPos.nContent.GetIndex()); + aStr += OUString::number(rPos.nContent.GetIndex()); aStr += String(": ", RTL_TEXTENCODING_ASCII_US); - aStr += String::CreateFromInt32 + aStr += OUString::number (reinterpret_cast<sal_IntPtr>(rPos.nContent.GetIdxReg()), 16); aStr += String(" )", RTL_TEXTENCODING_ASCII_US); @@ -407,13 +407,13 @@ static String lcl_dbg_out(const SwRect & rRect) { String aResult("[ [", RTL_TEXTENCODING_ASCII_US); - aResult += String::CreateFromInt32(rRect.Left()); + aResult += OUString::number(rRect.Left()); aResult += String(", ", RTL_TEXTENCODING_ASCII_US); - aResult += String::CreateFromInt32(rRect.Top()); + aResult += OUString::number(rRect.Top()); aResult += String("], [", RTL_TEXTENCODING_ASCII_US); - aResult += String::CreateFromInt32(rRect.Right()); + aResult += OUString::number(rRect.Right()); aResult += String(", ", RTL_TEXTENCODING_ASCII_US); - aResult += String::CreateFromInt32(rRect.Bottom()); + aResult += OUString::number(rRect.Bottom()); aResult += String("] ]", RTL_TEXTENCODING_ASCII_US); @@ -539,17 +539,17 @@ static String lcl_dbg_out(const SwNode & rNode) aTmpStr += String("<node ", RTL_TEXTENCODING_ASCII_US); aTmpStr += String("index=\"", RTL_TEXTENCODING_ASCII_US); - aTmpStr += String::CreateFromInt32(rNode.GetIndex()); + aTmpStr += OUString::number(rNode.GetIndex()); aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US); #ifdef DBG_UTIL aTmpStr += String(" serial=\"", RTL_TEXTENCODING_ASCII_US); - aTmpStr += String::CreateFromInt32(rNode.GetSerial()); + aTmpStr += OUString::number(rNode.GetSerial()); aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US); #endif aTmpStr += String(" type=\"", RTL_TEXTENCODING_ASCII_US); - aTmpStr += String::CreateFromInt32(sal_Int32( rNode.GetNodeType() ) ); + aTmpStr += OUString::number(sal_Int32( rNode.GetNodeType() ) ); aTmpStr += String("\"", RTL_TEXTENCODING_ASCII_US); aTmpStr += String(" pointer=\"", RTL_TEXTENCODING_ASCII_US); @@ -574,7 +574,7 @@ static String lcl_dbg_out(const SwNode & rNode) aTmpStr += String("<tbl/>", RTL_TEXTENCODING_ASCII_US); aTmpStr += String("<outlinelevel>", RTL_TEXTENCODING_ASCII_US); - aTmpStr += String::CreateFromInt32(pTxtNode->GetAttrOutlineLevel()-1); + aTmpStr += OUString::number(pTxtNode->GetAttrOutlineLevel()-1); aTmpStr += String("</outlinelevel>", RTL_TEXTENCODING_ASCII_US); const SwNumRule * pNumRule = pTxtNode->GetNumRule(); @@ -629,7 +629,7 @@ static String lcl_dbg_out(const SwNode & rNode) aTmpStr += pColl->GetName(); aTmpStr += String("(", RTL_TEXTENCODING_ASCII_US); - aTmpStr += String::CreateFromInt32 + aTmpStr += OUString::number (static_cast<SwTxtFmtColl *>(pColl)->GetAssignedOutlineStyleLevel());//<-end,zhaojianwei const SwNumRuleItem & rItem = @@ -672,7 +672,7 @@ static String lcl_dbg_out(const SwNode & rNode) const SwStartNode * pStartNode = dynamic_cast<const SwStartNode *> (&rNode); if (pStartNode != NULL) - aTmpStr += String::CreateFromInt32(pStartNode->EndOfSectionNode()->GetIndex()); + aTmpStr += OUString::number(pStartNode->EndOfSectionNode()->GetIndex()); aTmpStr += String("\"/>", RTL_TEXTENCODING_ASCII_US); } @@ -788,7 +788,7 @@ static String lcl_dbg_out(const SwUndo & rUndo) { String aStr("[ ", RTL_TEXTENCODING_ASCII_US); - aStr += String::CreateFromInt32( + aStr += OUString::number( static_cast<SfxUndoAction const&>(rUndo).GetId()); aStr += String(": ", RTL_TEXTENCODING_ASCII_US); @@ -879,7 +879,7 @@ static String lcl_dbg_out(const SwTxtFmtColl & rFmt) String aResult(rFmt.GetName()); aResult += String("(", RTL_TEXTENCODING_ASCII_US); - aResult += String::CreateFromInt32(rFmt.GetAttrOutlineLevel()); + aResult += OUString::number(rFmt.GetAttrOutlineLevel()); aResult += String(")", RTL_TEXTENCODING_ASCII_US); return aResult; diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 46bea2e18181..682300d0454a 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1272,13 +1272,13 @@ static void lcl_FormatPostIt( String aStr( ViewShell::GetShellRes()->aPostItPage ); aStr.AppendAscii(sTmp); - aStr += XubString::CreateFromInt32( nPageNo ); + aStr += OUString::number( nPageNo ); aStr += ' '; if( nLineNo ) { aStr += ViewShell::GetShellRes()->aPostItLine; aStr.AppendAscii(sTmp); - aStr += XubString::CreateFromInt32( nLineNo ); + aStr += OUString::number( nLineNo ); aStr += ' '; } aStr += ViewShell::GetShellRes()->aPostItAuthor; diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 8dc5406b2d4d..65022fac1689 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1211,7 +1211,7 @@ String SwCompareLine::GetText() const { case CONTENT_SECTION: if( rSect.IsProtect() ) - sRet.Append( String::CreateFromInt32( + sRet.Append( OUString::number( rSNd.EndOfSectionIndex() - rSNd.GetIndex() )); break; @@ -1223,7 +1223,7 @@ String SwCompareLine::GetText() const sRet.Append( pTOX->GetTitle() ) .Append( pTOX->GetTypeName() ) // .Append( pTOX->GetTOXName() ) - .Append( String::CreateFromInt32( pTOX->GetType() )); + .Append( OUString::number( pTOX->GetType() )); } break; diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 3f95668da05d..36ef16443e0a 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -170,7 +170,7 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp ) sal_uInt16 nNum = 1; do { String sSrch( rFldNm ); - sSrch.Append( String::CreateFromInt32( nNum )); + sSrch.Append( OUString::number( nNum )); for( i = INIT_FLDTYPES; i < nSize; ++i ) if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() && rSCmp.isEqual( sSrch, pFnd->GetName() ) ) @@ -1681,7 +1681,7 @@ static String lcl_DBDataToString(const SwDBData& rData) sRet += DB_DELIM; sRet += (String)rData.sCommand; sRet += DB_DELIM; - sRet += String::CreateFromInt32(rData.nCommandType); + sRet += OUString::number(rData.nCommandType); return sRet; } diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 4329d28315d2..2d0988247906 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1986,7 +1986,7 @@ static String lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId ) } delete [] pSetFlags; - return aName += String::CreateFromInt32( ++nNum ); + return aName += OUString::number( ++nNum ); } String SwDoc::GetUniqueGrfName() const @@ -2132,7 +2132,7 @@ void SwDoc::SetAllUniqueFlyNames() nNum = ++nFlyNum; break; } - pFlyFmt->SetName( sNm += String::CreateFromInt32( nNum )); + pFlyFmt->SetName( sNm += OUString::number( nNum )); } aArr.clear(); diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index c4a3c1fea5da..d70655729706 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -2287,7 +2287,7 @@ String SwDoc::GetUniqueNumRuleName( const String* pChkStr, bool bAutoNum ) const delete [] pSetFlags; if( pChkStr && pChkStr->Len() ) return *pChkStr; - return aName += String::CreateFromInt32( ++nNum ); + return aName += OUString::number( ++nNum ); } void SwDoc::UpdateNumRule() @@ -2596,7 +2596,7 @@ namespace listfunc { ++nHitCount; aTmpStr = aSuggestedUniqueListId; - aTmpStr += String::CreateFromInt32( nHitCount ); + aTmpStr += OUString::number( nHitCount ); } return aTmpStr; diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 17ef88c6291b..66c7cb290f13 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -2134,7 +2134,7 @@ bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete ) { SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, String::CreateFromInt32(nRet)); + aRewriter.AddRule(UndoArg1, OUString::number(nRet)); aTmpStr = aRewriter.Apply(String(SW_RES(STR_N_REDLINES))); } @@ -2244,7 +2244,7 @@ bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete ) { SwRewriter aRewriter; - aRewriter.AddRule(UndoArg1, String::CreateFromInt32(nRet)); + aRewriter.AddRule(UndoArg1, OUString::number(nRet)); aTmpStr = aRewriter.Apply(String(SW_RES(STR_N_REDLINES))); } diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 66153620cfd0..9c613e0011f6 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -668,7 +668,7 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType, delete [] pSetFlags; if( pChkStr ) return *pChkStr; - return aName += String::CreateFromInt32( ++nNum ); + return aName += OUString::number( ++nNum ); } bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName) diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 763303a94d5b..026a30caecbb 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -694,7 +694,7 @@ String SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVector, if( rNumVector[ i ] ) { if( bOnlyArabic ) - aStr += String::CreateFromInt32( rNumVector[ i ] ); + aStr += OUString::number( rNumVector[ i ] ); else aStr += rNFmt.GetNumStr( rNumVector[ i ] ); } diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 12f8349d0d2d..7e4035883a02 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -1431,7 +1431,7 @@ String SwDoc::GetUniqueSectionName( const String* pChkStr ) const delete [] pSetFlags; if( pChkStr ) return *pChkStr; - return aName += String::CreateFromInt32( ++nNum ); + return aName += OUString::number( ++nNum ); } diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 5f6dad997662..882ff1b36831 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -3919,7 +3919,7 @@ String SwDoc::GetUniqueTblName() const } delete [] pSetFlags; - return aName += String::CreateFromInt32( ++nNum ); + return aName += OUString::number( ++nNum ); } SwTableFmt* SwDoc::FindTblFmtByName( const String& rName, sal_Bool bAll ) const diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index dbb61e28993e..4caa4228159f 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -181,8 +181,8 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, // without MapMode-Offset, without Offset, w ... !!!!! aPt = pWindow->LogicToPixel( aPt, MapMode( MAP_TWIP ) ); - ((( sTxt += '?' ) += String::CreateFromInt32( aPt.X() )) - += ',' ) += String::CreateFromInt32( aPt.Y() ); + ((( sTxt += '?' ) += OUString::number( aPt.X() )) + += ',' ) += OUString::number( aPt.Y() ); } } diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 99edb81ca531..1508ab6aecf9 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -981,7 +981,7 @@ CHECK_ROMAN_5: eScan |= CHG; if( pPreFix ) (*pPreFix += (sal_Unicode)1) - += String::CreateFromInt32( nStart ); + += OUString::number( nStart ); } eScan &= ~NO_DELIM; // Delim raus eScan |= DELIM; // Digit rein @@ -998,7 +998,7 @@ CHECK_ROMAN_5: return USHRT_MAX; if( (NO_DELIM & eScan) && pPreFix ) // den letzen nicht vergessen - (*pPreFix += (sal_Unicode)1) += String::CreateFromInt32( nStart ); + (*pPreFix += (sal_Unicode)1) += OUString::number( nStart ); rPos = nPos; return nDigitLvl; // 0 .. 9 (MAXLEVEL - 1) @@ -1819,7 +1819,7 @@ void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl ) String sTxt(ViewShell::GetShellRes()->GetAutoFmtNameLst()[ STR_AUTOFMTREDL_SET_TMPL_HEADLINE ] ); sTxt.SearchAndReplace( rtl::OUString("$(ARG1)"), - String::CreateFromInt32( nLvl + 1 ) ); + OUString::number( nLvl + 1 ) ); pDoc->SetAutoFmtRedlineComment( &sTxt ); } diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index f8ffa9e9205b..8870c4e4710e 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -553,7 +553,7 @@ String SwAuthorityField::Expand() const if(!pAuthType->GetDoc()->IsExpFldsLocked()) m_nTempSequencePos = pAuthType->GetSequencePos( m_nHandle ); if( m_nTempSequencePos >= 0 ) - sRet += String::CreateFromInt32( m_nTempSequencePos ); + sRet += OUString::number( m_nTempSequencePos ); } else { diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 9829645d602f..62c03c62252a 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -843,9 +843,9 @@ static String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd, sCpy = sTmp; //JP 01.11.95: den Rest aus dem BoxNamen anhaengen sTmp = cRelKennung; - sTmp += String::CreateFromInt32( nBox ); + sTmp += OUString::number( nBox ); sTmp += cRelTrenner; - sTmp += String::CreateFromInt32( nLine ); + sTmp += OUString::number( nLine ); if( sCpy.Len() ) { diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index 1072b5085507..bea128ecd751 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -796,7 +796,7 @@ bool SwDBNumSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) { sal_Int32 nVal = 0; rAny >>= nVal; - aPar2 = String::CreateFromInt32(nVal); + aPar2 = OUString::number(nVal); } break; default: diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 59fe3a53e137..5cb84001fabe 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -789,7 +789,7 @@ String SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const if( nVal <= SHRT_MAX ) sRet = FormatNumber( (sal_uInt16)nVal, nFmt ); else - sRet = String::CreateFromInt32( nVal ); + sRet = OUString::number( nVal ); return sRet; } @@ -930,7 +930,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, xDocProps->getKeywords()); break; case DI_COMMENT:aStr = xDocProps->getDescription(); break; - case DI_DOCNO: aStr = String::CreateFromInt32( + case DI_DOCNO: aStr = OUString::number( xDocProps->getEditingCycles() ); break; case DI_EDIT: @@ -1131,12 +1131,12 @@ String SwDocInfoField::Expand() const { String sText = aDuration.Negative ? rtl::OUString('-') : rtl::OUString('+'); sText += ViewShell::GetShellRes()->sDurationFormat; - sText.SearchAndReplace(rtl::OUString("%1"), String::CreateFromInt32( aDuration.Years ) ); - sText.SearchAndReplace(rtl::OUString("%2"), String::CreateFromInt32( aDuration.Months ) ); - sText.SearchAndReplace(rtl::OUString("%3"), String::CreateFromInt32( aDuration.Days ) ); - sText.SearchAndReplace(rtl::OUString("%4"), String::CreateFromInt32( aDuration.Hours ) ); - sText.SearchAndReplace(rtl::OUString("%5"), String::CreateFromInt32( aDuration.Minutes) ); - sText.SearchAndReplace(rtl::OUString("%6"), String::CreateFromInt32( aDuration.Seconds) ); + sText.SearchAndReplace(rtl::OUString("%1"), OUString::number( aDuration.Years ) ); + sText.SearchAndReplace(rtl::OUString("%2"), OUString::number( aDuration.Months ) ); + sText.SearchAndReplace(rtl::OUString("%3"), OUString::number( aDuration.Days ) ); + sText.SearchAndReplace(rtl::OUString("%4"), OUString::number( aDuration.Hours ) ); + sText.SearchAndReplace(rtl::OUString("%5"), OUString::number( aDuration.Minutes) ); + sText.SearchAndReplace(rtl::OUString("%6"), OUString::number( aDuration.Seconds) ); sVal = sText; } else @@ -1271,7 +1271,7 @@ bool SwDocInfoField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) if( nSubType & DI_SUB_FIXED ) { rAny >>= nValue; - aContent = String::CreateFromInt32(nValue); + aContent = OUString::number(nValue); } break; diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index a28d6eeb74e9..5671cc02849c 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -428,7 +428,7 @@ SwField * SwField::CopyField() const String FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat) { if(SVX_NUM_PAGEDESC == nFormat) - return String::CreateFromInt32( nNum ); + return OUString::number( nNum ); SvxNumberType aNumber; OSL_ENSURE(nFormat != SVX_NUM_NUMBER_NONE, "Falsches Nummern-Format" ); diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 806f055e0c95..43eae4b57bd3 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -434,7 +434,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr ) pPage->GetPageDesc() ) sTxt = pPage->GetPageDesc()->GetNumType().GetNumStr( nPageNo ); else - sTxt = String::CreateFromInt32(nPageNo); + sTxt = OUString::number(nPageNo); } } break; diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 74ecf3180f6b..f59d6d994cf6 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -1602,8 +1602,8 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, String* pURL, // without MapMode-Offset, without Offset, o ... !!!!! aPt = GetOut()->LogicToPixel( aPt, MapMode( MAP_TWIP ) ); - ((( *pURL += '?' ) += String::CreateFromInt32( aPt.X() )) - += ',' ) += String::CreateFromInt32(aPt.Y() ); + ((( *pURL += '?' ) += OUString::number( aPt.X() )) + += ',' ) += OUString::number(aPt.Y() ); } } pRet = pFly->GetFmt(); diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx index 09ee92037247..48cae6aa22a8 100644 --- a/sw/source/core/swg/SwXMLTextBlocks.cxx +++ b/sw/source/core/swg/SwXMLTextBlocks.cxx @@ -274,7 +274,7 @@ sal_uLong SwXMLTextBlocks::CopyBlock( SwImpBlocks& rDestImp, String& rShort, rDestImp.CloseFile(); return ERR_SWG_WRITE_ERROR; } - sDestShortName += String::CreateFromInt32( nIdx ); + sDestShortName += OUString::number( nIdx ); } try diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 6c678f7aba1f..593271a1374f 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1904,13 +1904,13 @@ String SwTableBox::GetName() const const SwTableLines* pLines = pLine->GetUpper() ? &pLine->GetUpper()->GetTabLines() : &rTbl.GetTabLines(); - sTmp = String::CreateFromInt32( nPos = pLines->GetPos( pLine ) + 1 ); + sTmp = OUString::number( nPos = pLines->GetPos( pLine ) + 1 ); if( sNm.Len() ) sNm.Insert( aDotStr, 0 ).Insert( sTmp, 0 ); else sNm = sTmp; - sTmp = String::CreateFromInt32(( nPos = pBoxes->GetPos( pBox )) + 1 ); + sTmp = OUString::number(( nPos = pBoxes->GetPos( pBox )) + 1 ); if( 0 != ( pBox = pLine->GetUpper()) ) sNm.Insert( aDotStr, 0 ).Insert( sTmp, 0 ); else diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index d4996657006b..21e0fb208446 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -662,7 +662,7 @@ String SwFormToken::GetString() const case TOKEN_AUTHORITY: { sRet.AssignAscii( SwForm::aFormAuth ); - String sTmp( String::CreateFromInt32( nAuthorityField )); + String sTmp( OUString::number( nAuthorityField )); if( sTmp.Len() < 2 ) sTmp.Insert('0', 0); sRet.Insert( sTmp, 2 ); @@ -675,26 +675,26 @@ String SwFormToken::GetString() const sRet += ' '; sRet += sCharStyleName; sRet += ','; - sRet += String::CreateFromInt32( nPoolId ); + sRet += OUString::number( nPoolId ); sRet += ','; // TabStopPosition and TabAlign or ChapterInfoFormat if(TOKEN_TAB_STOP == eTokenType) { - sRet += String::CreateFromInt32( nTabStopPosition ); + sRet += OUString::number( nTabStopPosition ); sRet += ','; - sRet += String::CreateFromInt32( static_cast< sal_Int32 >(eTabAlign) ); + sRet += OUString::number( static_cast< sal_Int32 >(eTabAlign) ); sRet += ','; sRet += cTabFillChar; sRet += ','; - sRet += String::CreateFromInt32( bWithTab ); + sRet += OUString::number( bWithTab ); } else if(TOKEN_CHAPTER_INFO == eTokenType) { - sRet += String::CreateFromInt32( nChapterFormat ); + sRet += OUString::number( nChapterFormat ); // add maximum permitted level sRet += ','; - sRet += String::CreateFromInt32( nOutlineLevel ); + sRet += OUString::number( nOutlineLevel ); } else if(TOKEN_TEXT == eTokenType) { @@ -711,10 +711,10 @@ String SwFormToken::GetString() const } else if(TOKEN_ENTRY_NO == eTokenType) { - sRet += String::CreateFromInt32( nChapterFormat ); + sRet += OUString::number( nChapterFormat ); // add maximum permitted level sRet += ','; - sRet += String::CreateFromInt32( nOutlineLevel ); + sRet += OUString::number( nOutlineLevel ); } if(bAppend) diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index 3645d7b3a770..8cf6e1886cf6 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -586,7 +586,7 @@ static String lcl_DenotedPortion(String rStr, xub_StrLen nStart, } SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, - String::CreateFromInt32(nEnd - nStart)); + OUString::number(nEnd - nStart)); aResult = aRewriter.Apply(aResult); } else diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 325d6e93a510..18951111bc3e 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -541,7 +541,7 @@ MakeUndoReplaceRewriter(sal_uLong const occurrences, if (1 < occurrences) { - aResult.AddRule(UndoArg1, String::CreateFromInt32(occurrences)); + aResult.AddRule(UndoArg1, OUString::number(occurrences)); aResult.AddRule(UndoArg2, String(SW_RES(STR_OCCURRENCES_OF))); String aTmpStr; diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 0553e9c5de1a..106e777fe053 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -1535,7 +1535,7 @@ void SwXTextField::attachToRange( pFld = new SwDBNumSetField( (SwDBNumSetFieldType*) pDoc->GetSysFldType(RES_DBNUMSETFLD), m_pProps->sPar3, - String::CreateFromInt32(m_pProps->nFormat), + OUString::number(m_pProps->nFormat), aData ); } break; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 224ebe21aa2f..b0e8b042b171 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -476,7 +476,7 @@ String sw_GetCellName( sal_Int32 nColumn, sal_Int32 nRow ) if (nColumn < 0 || nRow < 0) return sCellName; sw_GetTblBoxColStr( static_cast< sal_uInt16 >(nColumn), sCellName ); - sCellName += String::CreateFromInt32( nRow + 1 ); + sCellName += OUString::number( nRow + 1 ); return sCellName; } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index fbc7b4cb3039..a167fc8c670d 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -143,7 +143,7 @@ void SwHTMLParser::EndScript() while( bFound ) { aBasicModule.AssignAscii( "Modul" ); - aBasicModule += String::CreateFromInt32( (sal_Int32)(++nSBModuleCnt) ); + aBasicModule += OUString::number( (sal_Int32)(++nSBModuleCnt) ); bFound = xModLib->hasByName( ::rtl::OUString( aBasicModule ) ); } } diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index a163ff45bbb5..4141a146be31 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1551,7 +1551,7 @@ void SwCSS1Parser::FillDropCap( SwFmtDrop& rDrop, aName.AssignAscii( sCSS1_first_letter ); aName.Append( ' ' ); aName.Append( - String::CreateFromInt32( (sal_Int32)(++nDropCapCnt) ) ); + OUString::number( (sal_Int32)(++nDropCapCnt) ) ); } while( pDoc->FindCharFmtByName(aName) ); } diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 9bb0d79a0cad..6ddbdde1d298 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -867,7 +867,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, aNameBase.AssignAscii( OOO_STRING_SVTOOLS_HTML_map ); if( !aIMapName.Len() ) (aIMapName = aNameBase) - += String::CreateFromInt32( rHTMLWrt.nImgMapCnt ); + += OUString::number( rHTMLWrt.nImgMapCnt ); sal_Bool bFound; do @@ -887,7 +887,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, { rHTMLWrt.nImgMapCnt++; (aIMapName = aNameBase) - += String::CreateFromInt32( rHTMLWrt.nImgMapCnt ); + += OUString::number( rHTMLWrt.nImgMapCnt ); } } while( bFound ); diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index be7ee34047a5..2e4a451aca0f 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -283,14 +283,14 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt ) "OutHTML_SwFmtFtn: Position falsch" ); sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote_anc ); sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); - sFtnName += String::CreateFromInt32( (sal_Int32)(++rHTMLWrt.nEndNote) ); + sFtnName += OUString::number( (sal_Int32)(++rHTMLWrt.nEndNote) ); } else { nPos = rHTMLWrt.nFootNote; sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote_anc ); sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote); - sFtnName += String::CreateFromInt32( (sal_Int32)(++rHTMLWrt.nFootNote)); + sFtnName += OUString::number( (sal_Int32)(++rHTMLWrt.nFootNote)); } if( !rHTMLWrt.pFootEndNotes ) @@ -346,13 +346,13 @@ void SwHTMLWriter::OutFootEndNotes() { sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); - sFtnName.Append( String::CreateFromInt32((sal_Int32)(++nEndNote)) ); + sFtnName.Append( OUString::number((sal_Int32)(++nEndNote)) ); } else { sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote ); sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote ); - sFtnName.Append( String::CreateFromInt32((sal_Int32)(++nFootNote))); + sFtnName.Append( OUString::number((sal_Int32)(++nFootNote))); } if( bLFPossible ) @@ -437,14 +437,14 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn, { sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote_sym ); sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote ); - sFtnName.Append( String::CreateFromInt32((sal_Int32)nEndNote) ); + sFtnName.Append( OUString::number((sal_Int32)nEndNote) ); pInfo = &pDoc->GetEndNoteInfo(); } else { sClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote_sym ); sFtnName.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote ); - sFtnName.Append( String::CreateFromInt32((sal_Int32)nFootNote)); + sFtnName.Append( OUString::number((sal_Int32)nFootNote)); pInfo = &pDoc->GetFtnInfo(); } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 4322e9815752..406f6500a59d 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -229,9 +229,9 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, co pStrm->ResetError(); else if( SVPAR_ACCEPTED != eState ) { - String sErr( String::CreateFromInt32((sal_Int32)xParser->GetLineNr())); + String sErr( OUString::number((sal_Int32)xParser->GetLineNr())); sErr += ','; - sErr += String::CreateFromInt32((sal_Int32)xParser->GetLinePos()); + sErr += OUString::number((sal_Int32)xParser->GetLinePos()); // den Stream als Fehlernummer Transporter benutzen nRet = *new StringErrorInfo( ERR_FORMAT_ROWCOL, sErr, diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx index 67d67c90c7a1..c4fe8f2faa9c 100644 --- a/sw/source/filter/ww1/w1filter.cxx +++ b/sw/source/filter/ww1/w1filter.cxx @@ -575,7 +575,7 @@ void Ww1Fields::Out(Ww1Shell& rOut, Ww1Manager& rMan, sal_uInt16 nDepth) rMan.Fill(c); OSL_ENSURE(c==21, "Ww1PlainText"); sFormel.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "Ww" )); - sFormel += String::CreateFromInt32( nPlcIndex ); + sFormel += OUString::number( nPlcIndex ); c = rMan.Fill(aStr, GetLength()); OSL_ENSURE(Ww1PlainText::IsChar(c), "Ww1PlainText"); sFormel += aStr; @@ -815,7 +815,7 @@ oncemore: else // rekursion: { rtl::OUString aName("Ww"); - aName += String::CreateFromInt32( nPlcIndex ); + aName += OUString::number( nPlcIndex ); SwFieldType* pFT = rOut.GetDoc().GetFldType( RES_SETEXPFLD, aName, false); if (pFT == 0) { diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index f8c3eef3ad0b..c0149d536add 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -301,7 +301,7 @@ namespace myImplHelpers (nI < SAL_MAX_INT32) ) { - aName += String::CreateFromInt32(nI++); + aName += OUString::number(nI++); } } diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index c91bf51c3b13..fd1cfa4f67d1 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -655,7 +655,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/, OSL_ENSURE( !this,"Unhandled Ruby justication code" ); break; } - aStr += String::CreateFromInt32( nJC ); + aStr += OUString::number( nJC ); /* MS needs to know the name and size of the font used in the ruby item, @@ -704,7 +704,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/, aStr.AppendAscii( " \\* \"Font:" ); aStr.Append( sFamilyName ); aStr.AppendAscii( "\" \\* hps" ); - aStr += String::CreateFromInt32( nHeight ); + aStr += OUString::number( nHeight ); aStr.AppendAscii( " \\o" ); if ( cDirective ) { @@ -725,7 +725,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/, ( const SvxFontHeightItem& )rSet.Get( GetWhichOfScript( RES_CHRATR_FONTSIZE, nRubyScript ) ); nHeight = (rHeightItem.GetHeight() + 10)/20-1; - aStr += String::CreateFromInt32(nHeight); + aStr += OUString::number(nHeight); aStr += '('; aStr += rRuby.GetText(); aStr.AppendAscii( ")" ); @@ -783,7 +783,7 @@ bool AttributeOutputBase::AnalyzeURL( const String& rUrl, const String& /*rTarge if ( bkmkName == sLink ) { sMark = String( "_toc" ); - sMark += String::CreateFromInt32( aIter->second ); + sMark += OUString::number( aIter->second ); } } } @@ -1109,7 +1109,7 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt nLvl = WW8ListManager::nMaxLevel; ((sTxt.AppendAscii( "\" \\l " )) - += String::CreateFromInt32( nLvl )) += ' '; + += OUString::number( nLvl )) += ' '; } break; default: @@ -1782,7 +1782,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) if ( aAttrIter.RequiresImplicitBookmark() ) { String sBkmkName = String( "_toc" ); - sBkmkName += String::CreateFromInt32( rNode.GetIndex() ); + sBkmkName += OUString::number( rNode.GetIndex() ); AppendWordBookmark( sBkmkName ); } diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index 68826bab030d..830c261b7408 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -46,7 +46,7 @@ sal_uInt16 MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, sal_uInt8 { sal_uInt16 nNumId = USHRT_MAX; String sPrefix(rtl::OUString("WW8TempExport")); - sPrefix += String::CreateFromInt32( nUniqueList++ ); + sPrefix += OUString::number( nUniqueList++ ); SwNumRule* pMyNumRule = new SwNumRule( pDoc->GetUniqueNumRuleName( &sPrefix ), SvxNumberFormat::LABEL_WIDTH_AND_POSITION ); @@ -399,7 +399,7 @@ void MSWordExportBase::AbstractNumberingDefinitions() // now search the nums in the string for( sal_uInt8 i = 0; i <= nLvl; ++i ) { - String sSrch( String::CreateFromInt32( i )); + String sSrch( OUString::number( i )); xub_StrLen nFnd = sNumStr.Search( sSrch ); if( STRING_NOTFOUND != nFnd ) { diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx index c70ad3c71748..6c0c31ee23bd 100644 --- a/sw/source/filter/ww8/wrtww8gr.cxx +++ b/sw/source/filter/ww8/wrtww8gr.cxx @@ -246,7 +246,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode ) nPictureId = aRes.first->second; Set_UInt32(pDataAdr, nPictureId); String sStorageName = rtl::OUString('_'); - sStorageName += String::CreateFromInt32( nPictureId ); + sStorageName += OUString::number( nPictureId ); SvStorageRef xOleStg = xObjStg->OpenSotStorage( sStorageName, STREAM_READWRITE| STREAM_SHARE_DENYALL ); if( xOleStg.Is() ) diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 7440be4e5516..baeb447a65d8 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -884,11 +884,11 @@ String MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const rtl::OUString* break; // ??? case REF_FOOTNOTE: sRet.AppendAscii( "_RefF" ); - sRet += String::CreateFromInt32( nSeqNo ); + sRet += OUString::number( nSeqNo ); break; case REF_ENDNOTE: sRet.AppendAscii( "_RefE" ); - sRet += String::CreateFromInt32( nSeqNo ); + sRet += OUString::number( nSeqNo ); break; } return BookmarkToWord( sRet ); // #i43956# - encode bookmark accordingly @@ -2102,7 +2102,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) nTmpLvl = WW8ListManager::nMaxLevel; sStr.AppendAscii( "\\o \"1-" ); - sStr += String::CreateFromInt32( nTmpLvl ); + sStr += OUString::number( nTmpLvl ); sStr.AppendAscii(sEntryEnd); } @@ -2160,7 +2160,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) nMaxMSAutoEvaluate = WW8ListManager::nMaxLevel; sStr.AppendAscii( "\\o \"1-" ); - sStr += String::CreateFromInt32( nMaxMSAutoEvaluate ); + sStr += OUString::number( nMaxMSAutoEvaluate ); sStr.AppendAscii(sEntryEnd); } @@ -2181,7 +2181,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) if( sTOption.Len() ) sTOption += ','; (( sTOption += pColl->GetName() ) += ',' ) - += String::CreateFromInt32( nTestLvl + 1 ); + += OUString::number( nTestLvl + 1 ); } } } @@ -2196,7 +2196,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) { xub_StrLen nPos = 0; String sLvl = rtl::OUString(','); - sLvl += String::CreateFromInt32( n + 1 ); + sLvl += OUString::number( n + 1 ); do { String sStyle( rStyles.GetToken( 0, TOX_STYLE_DELIMITER, nPos )); @@ -2251,9 +2251,9 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) if (WW8ListManager::nMaxLevel < nNoPgEnd) nNoPgEnd = WW8ListManager::nMaxLevel; sStr.AppendAscii( "\\n " ); - sStr += String::CreateFromInt32( nNoPgStt ); + sStr += OUString::number( nNoPgStt ); sStr += '-'; - sStr += String::CreateFromInt32( nNoPgEnd ); + sStr += OUString::number( nNoPgEnd ); sStr += ' '; } if( bOnlyText ) @@ -2886,12 +2886,12 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField ) xub_StrLen nAbove = (pFld->GetPar1().getLength()+1)/2; sStr = FieldString(ww::eEQ); sStr.AppendAscii("\\o (\\s\\up "); - sStr += String::CreateFromInt32(nHeight/2); + sStr += OUString::number(nHeight/2); sStr.Append('('); sStr += String(pFld->GetPar1(),0,nAbove); sStr.AppendAscii("), \\s\\do "); - sStr += String::CreateFromInt32(nHeight/5); + sStr += OUString::number(nHeight/5); sStr.Append('('); sStr += String(pFld->GetPar1(),nAbove,pFld->GetPar1().getLength()-nAbove); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 37cb65df4a1e..7ee328119e9d 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -973,7 +973,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule, { // Style definieren String aName( sPrefix.Len() ? sPrefix : rNumRule.GetName() ); - (aName += 'z') += String::CreateFromInt32( nLevel ); + (aName += 'z') += OUString::number( nLevel ); // const Wegcasten pFmt = rDoc.MakeCharFmt(aName, (SwCharFmt*)rDoc.GetDfltCharFmt()); @@ -1027,7 +1027,7 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple) { // wird erstmal zur Bildung des Style Namens genommen String sPrefix(rtl::OUString("WW8Num")); - sPrefix += String::CreateFromInt32(nUniqueList++); + sPrefix += OUString::number(nUniqueList++); // #i86652# sal_uInt16 nRul = rDoc.MakeNumRule( rDoc.GetUniqueNumRuleName(&sPrefix), 0, false, @@ -1262,7 +1262,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_) // Nauemsprefix aufbauen: fuer NumRule-Name (eventuell) // und (falls vorhanden) fuer Style-Name (dann auf jeden Fall) String sPrefix(rtl::OUString("WW8NumSt")); - sPrefix += String::CreateFromInt32( nLfo + 1 ); + sPrefix += OUString::number( nLfo + 1 ); // jetzt dem pNumRule seinen RICHTIGEN Wert zuweisen !!! // (bis dahin war hier die Parent NumRule vermerkt ) // diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index a5346d1a6190..8e92ce6c05b8 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -346,7 +346,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, String aSrcStgName = rtl::OUString('_'); // ergibt Name "_4711" - aSrcStgName += String::CreateFromInt32( nObjLocFc ); + aSrcStgName += OUString::number( nObjLocFc ); SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool)); SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName, diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 3b490a0ba6ed..0760c96021fa 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -386,7 +386,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*) String sTmp( sHex ); if( cChar < 0x10 ) sTmp += '0'; - sTmp += String::CreateFromInt32( cChar, 16 ); + sTmp += OUString::number( cChar, 16 ); aVal.Replace( nI, 1 , sTmp ); nI += sTmp.Len() - 1; } @@ -754,7 +754,7 @@ sal_uInt16 SwWW8ImplReader::End_Field() { // Store the OLE object as an internal link String sOleId = rtl::OUString('_'); - sOleId += String::CreateFromInt32( maFieldStack.back().mnObjLocFc ); + sOleId += OUString::number( maFieldStack.back().mnObjLocFc ); SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool)); SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, STREAM_READ ); @@ -1200,7 +1200,7 @@ void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg ) String sTmp( sHex ); if( cChar < 0x10 ) sTmp += '0'; - sTmp += String::CreateFromInt32( cChar, 16 ); + sTmp += OUString::number( cChar, 16 ); rStr.Replace( nI, 1 , sTmp ); nI += sTmp.Len() - 1; } @@ -1214,7 +1214,7 @@ void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const String& rTagTe { String aName(rtl::OUString("WwFieldTag")); if( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Nummer? - aName += String::CreateFromInt32( nId ); // ausgeben ? + aName += OUString::number( nId ); // ausgeben ? if( SwFltGetFlag(nFieldFlags, SwFltControlStack::TAGS_IN_TEXT)) { @@ -1387,7 +1387,7 @@ long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF, { sName = rtl::OUString("WWSetBkmk"); nNo = pReffingStck->aFieldVarNames.size()+1; - sName += String::CreateFromInt32(nNo); + sName += OUString::number(nNo); nNo += pPlcxMan->GetBook()->GetIMax(); } pReffedStck->NewAttr(*pPaM->GetPoint(), @@ -2389,7 +2389,7 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, String& rStr ) String wwSectionNamer::UniqueName() { String aName(msFileLinkSeed); - aName += String::CreateFromInt32(++mnFileSectionNo); + aName += OUString::number(++mnFileSectionNo); return mrDoc.GetUniqueSectionName(&aName); } @@ -2715,7 +2715,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam) String aNm; //Take this as the base name SwStyleNameMapper::FillUIName(RES_POOLCHR_RUBYTEXT,aNm); - aNm+=String::CreateFromInt32(aRubyCharFmts.size()+1); + aNm+=OUString::number(aRubyCharFmts.size()+1); pFmt = rDoc.MakeCharFmt(aNm,(SwCharFmt*)rDoc.GetDfltCharFmt()); SvxFontHeightItem aHeightItem(nFontSize*10, 100, RES_CHRATR_FONTSIZE); SvxFontItem aFontItem(FAMILY_DONTKNOW,sFontName, diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index ca25dd2ea58e..ed3581943271 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -215,9 +215,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/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 66d3402c17d7..17c82d3a3992 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1189,7 +1189,7 @@ static String lcl_GenerateFldTypeName(OUString sPrefix, SwTableNode* pTableNode) nCount++; sName = sPrefixStr; - sName += String::CreateFromInt32(nCount); + sName += OUString::number(nCount); } while (NULL != pTableNode->GetDoc()->GetFldType(RES_DDEFLD, sName, false)); diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx index 72ad3251b492..fb1da4355e40 100644 --- a/sw/source/ui/app/appenv.cxx +++ b/sw/source/ui/app/appenv.cxx @@ -161,7 +161,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) pSh = pNewView->GetWrtShellPtr(); String aTmp( SW_RES(STR_ENV_TITLE) ); - aTmp += String::CreateFromInt32( ++nTitleNo ); + aTmp += OUString::number( ++nTitleNo ); xDocSh->SetTitle( aTmp ); // if applicable, copy the old Collections "Sender" and "Reciever" to diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index 212b8fe6fe14..7b751486aa95 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -202,12 +202,12 @@ void SwModule::InsertLab(SfxRequest& rReq, sal_Bool bLabel) if(bLabel) { aTmp = String(SW_RES( STR_LAB_TITLE)); - aTmp += String::CreateFromInt32(++nLabelTitleNo ); + aTmp += OUString::number(++nLabelTitleNo ); } else { aTmp = pDlg->GetBusinessCardStr(); - aTmp += String::CreateFromInt32( ++nBCTitleNo ); + aTmp += OUString::number( ++nBCTitleNo ); } xDocSh->SetTitle( aTmp ); diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index b306ded45dda..ea3c74b0ce0d 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -1264,7 +1264,7 @@ void SwDocShell::Execute(SfxRequest& rReq) for( sal_uInt16 i = 0; i < MAXLEVEL; ++i ) { if( bOutline[i] ) - pEntries[nIdx++] = sOutline + String::CreateFromInt32( i+1 ); + pEntries[nIdx++] = sOutline + OUString::number( i+1 ); } OUString sStyle( SW_RESSTR(STR_FDLG_STYLE) ); diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx index 61f410dbf3bb..f9d35bdf9903 100644 --- a/sw/source/ui/config/modcfg.cxx +++ b/sw/source/ui/config/modcfg.cxx @@ -212,7 +212,7 @@ String SwModuleOptions::ConvertWordDelimiter(const String& rDelim, sal_Bool bFro if( c <= 0x1f || c >= 0x7f ) { sReturn.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "\\x" )) - += String::CreateFromInt32( c, 16 ); + += OUString::number( c, 16 ); } else sReturn += c; diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 9c6f1a6f1dc7..e8910d39867e 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -477,7 +477,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) } for (i = 0; i < MAXLEVEL; i++) - aLbLevel.InsertEntry(String::CreateFromInt32(i + 1)); + aLbLevel.InsertEntry(OUString::number(i + 1)); sal_Unicode nLvl = MAXLEVEL; rtl::OUString sDelim(": "); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 58b24eeb8fcf..0a9b3d9b0ca9 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -1635,7 +1635,7 @@ void SwInsertDBColAutoPilot::Commit() sColumnInsertNode += '0'; if( nCol < 10 ) sColumnInsertNode += '0'; - sColumnInsertNode += String::CreateFromInt32( nCol ); + sColumnInsertNode += OUString::number( nCol ); Sequence <rtl::OUString> aSubNodeNames = lcl_CreateSubNames(sColumnInsertNode); Sequence<PropertyValue> aSubValues(aSubNodeNames.getLength()); diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 855f4dfa7149..4364a6d49277 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -413,7 +413,7 @@ sal_Bool SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) sDBName += DB_DELIM; sDBName += (String)aInsertData.sCommand; sDBName += DB_DELIM; - sDBName += String::CreateFromInt32(aInsertData.nCommandType); + sDBName += OUString::number(aInsertData.nCommandType); rMergeDesc.rSh.ChangeDBFields( aDBNames, sDBName); SetInitDBFields(sal_False); } @@ -746,7 +746,7 @@ static String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStarti do { String sTest = rStartingPageDesc; - sTest += String::CreateFromInt32( nDocNo ); + sTest += OUString::number( nDocNo ); if( !pTargetShell->FindPageDescByName( sTest ) ) return sTest; ++nDocNo; @@ -1019,7 +1019,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, aPrtMonDlg.aPrinter.SetText( aTempFileURL.GetBase() ); String sStat(SW_RES(STR_STATSTR_LETTER)); // Brief sStat += ' '; - sStat += String::CreateFromInt32( nDocNo ); + sStat += OUString::number( nDocNo ); aPrtMonDlg.aPrintInfo.SetText(sStat); // computation time for Save-Monitor: @@ -2296,7 +2296,7 @@ String SwNewDBMgr::LoadAndRegisterDataSource() while(xDBContext->hasByName(sFind)) { sFind = sNewName; - sFind += String::CreateFromInt32(++nIndex); + sFind += OUString::number(++nIndex); } Reference<XInterface> xNewInstance; diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/ui/dbui/dbui.cxx index 0a3c5eaae619..b8e27e6f7c68 100644 --- a/sw/source/ui/dbui/dbui.cxx +++ b/sw/source/ui/dbui/dbui.cxx @@ -105,8 +105,8 @@ CreateMonitor::CreateMonitor( Window *pParent ) void CreateMonitor::UpdateCountingText() { String sText(m_sCountingPattern); - sText.SearchAndReplaceAll( m_sVariable_Total, String::CreateFromInt32( m_nTotalCount ) ); - sText.SearchAndReplaceAll( m_sVariable_Position, String::CreateFromInt32( m_nCurrentPosition ) ); + sText.SearchAndReplaceAll( m_sVariable_Total, OUString::number( m_nTotalCount ) ); + sText.SearchAndReplaceAll( m_sVariable_Position, OUString::number( m_nCurrentPosition ) ); m_aCounting.SetText(sText); } diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index eeab99f71552..de02632c986d 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -669,12 +669,12 @@ void SwSendMailDialog::DocumentSent( uno::Reference< mail::XMailMessage> xMessag void SwSendMailDialog::UpdateTransferStatus() { String sStatus( m_sTransferStatus ); - sStatus.SearchAndReplaceAscii("%1", String::CreateFromInt32(m_nSendCount) ); - sStatus.SearchAndReplaceAscii("%2", String::CreateFromInt32(m_pImpl->nDocumentCount)); + sStatus.SearchAndReplaceAscii("%1", OUString::number(m_nSendCount) ); + sStatus.SearchAndReplaceAscii("%2", OUString::number(m_pImpl->nDocumentCount)); m_aTransferStatusFT.SetText(sStatus); sStatus = m_sErrorStatus; - sStatus.SearchAndReplaceAscii("%1", String::CreateFromInt32(m_nErrorCount) ); + sStatus.SearchAndReplaceAscii("%1", OUString::number(m_nErrorCount) ); m_aErrorStatusFT.SetText(sStatus); if(m_pImpl->aDescriptors.size()) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index d91418613636..e07eb09c6c04 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -139,7 +139,7 @@ void SwMailMergeAddressBlockPage::ActivatePage() { m_aHideEmptyParagraphsCB.Check( rConfigItem.IsHideEmptyParagraphs() ); String sTemp(m_sDocument); - sTemp.SearchAndReplaceAscii("%1", String::CreateFromInt32(1)); + sTemp.SearchAndReplaceAscii("%1", OUString::number(1)); m_aDocumentIndexFI.SetText(sTemp); m_aSettingsWIN.Clear(); @@ -320,7 +320,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton } m_aPrevSetIB.Enable(bEnable); String sTemp(m_sDocument); - sTemp.SearchAndReplaceAscii("%1", String::CreateFromInt32(nPos)); + sTemp.SearchAndReplaceAscii("%1", OUString::number(nPos)); m_aDocumentIndexFI.SetText(sTemp); GetWizard()->enableButtons(WZB_NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE)); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 4e591ecf4c5a..bc85f5ffbe47 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -320,7 +320,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) lcl_FillGreetingsBox(m_aNeutralCB, rConfig, SwMailMergeConfigItem::NEUTRAL); String sTemp(m_sDocument); - sTemp.SearchAndReplaceAscii("%1", String::CreateFromInt32(1)); + sTemp.SearchAndReplaceAscii("%1", OUString::number(1)); m_aDocumentIndexFI.SetText(sTemp); } @@ -429,7 +429,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton) m_aNextSetIB.Enable(bEnable); m_aDocumentIndexFI.Enable(bEnable); String sTemp(m_sDocument); - sTemp.SearchAndReplaceAscii("%1", String::CreateFromInt32(nPos)); + sTemp.SearchAndReplaceAscii("%1", OUString::number(nPos)); m_aDocumentIndexFI.SetText(sTemp); return 0; } diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 03d8ec096c2b..19a810f53692 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -326,7 +326,7 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( sDBName += DB_DELIM; String sDatabaseConditionPrefix(sDBName); sDatabaseConditionPrefix.SearchAndReplaceAll(DB_DELIM, '.'); - sDBName += String::CreateFromInt32(rData.nCommandType); + sDBName += OUString::number(rData.nCommandType); sDBName += DB_DELIM; // if only the country is in an address line the @@ -542,7 +542,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig sDBName += DB_DELIM; sDBName += String(rData.sCommand); sDBName += DB_DELIM; - sDBName += String::CreateFromInt32(rData.nCommandType); + sDBName += OUString::number(rData.nCommandType); sDBName += DB_DELIM; // Female: [database.sGenderColumn] != "rFemaleGenderValue" && [database.NameColumn] diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 20705bd5f469..ca209521ae49 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -767,7 +767,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) } String sStat(SW_RES(STR_STATSTR_LETTER)); sStat += ' '; - sStat += String::CreateFromInt32( nDoc ); + sStat += OUString::number( nDoc ); aSaveMonitor.aPrintInfo.SetText(sStat); //now extract a document from the target document @@ -792,7 +792,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton) //then save it String sOutPath = aURL.GetMainURL(INetURLObject::DECODE_TO_IURI); String sCounter = rtl::OUString('_'); - sCounter += String::CreateFromInt32(nDoc); + sCounter += OUString::number(nDoc); sOutPath.Insert(sCounter, sOutPath.Len() - sExtension.Len() - 1); while(true) diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 15520729fcbc..8e3f0acfc511 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -96,14 +96,14 @@ void SwDocStatPage::Reset(const SfxItemSet &/*rSet*/) void SwDocStatPage::SetData(const SwDocStat &rStat) { - m_pTableNo->SetText(String::CreateFromInt32( rStat.nTbl )); - m_pGrfNo->SetText(String::CreateFromInt32( rStat.nGrf )); - m_pOLENo->SetText(String::CreateFromInt32( rStat.nOLE )); - m_pPageNo->SetText(String::CreateFromInt32( rStat.nPage )); - m_pParaNo->SetText(String::CreateFromInt32( rStat.nPara )); - m_pWordNo->SetText(String::CreateFromInt32( rStat.nWord )); - m_pCharNo->SetText(String::CreateFromInt32( rStat.nChar )); - m_pCharExclSpacesNo->SetText(String::CreateFromInt32( rStat.nCharExcludingSpaces )); + m_pTableNo->SetText(OUString::number( rStat.nTbl )); + m_pGrfNo->SetText(OUString::number( rStat.nGrf )); + m_pOLENo->SetText(OUString::number( rStat.nOLE )); + m_pPageNo->SetText(OUString::number( rStat.nPage )); + m_pParaNo->SetText(OUString::number( rStat.nPara )); + m_pWordNo->SetText(OUString::number( rStat.nWord )); + m_pCharNo->SetText(OUString::number( rStat.nChar )); + m_pCharExclSpacesNo->SetText(OUString::number( rStat.nCharExcludingSpaces )); } /*------------------------------------------------------------------------ @@ -136,7 +136,7 @@ IMPL_LINK_NOARG(SwDocStatPage, UpdateHdl) SwDocShell* pDocShell = (SwDocShell*) SfxObjectShell::Current(); SwFEShell* pFEShell = pDocShell->GetFEShell(); if(pFEShell) - m_pLineNo->SetText( String::CreateFromInt32( pFEShell->GetLineCount(sal_False))); + m_pLineNo->SetText( OUString::number( pFEShell->GetLineCount(sal_False))); //pButton->Disable(); return 0; } diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 079f87890433..0acfea750f62 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -2016,7 +2016,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData, do { aName = aApp; - aName += String::CreateFromInt32( i ); + aName += OUString::number( i ); for( j = INIT_FLDTYPES; j < nSize; j++ ) { pTyp = rWrtShell.GetFldType( j ); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index dcc0f7516477..726472b7ba7f 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -476,9 +476,9 @@ void SwLabPage::DisplayFormat() aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM(" x ")); aText += aField.GetText(); aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM(" (")); - aText += String::CreateFromInt32( pRec->nCols ); + aText += OUString::number( pRec->nCols ); aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM(" x ")); - aText += String::CreateFromInt32( pRec->nRows ); + aText += OUString::number( pRec->nRows ); aText += ')'; aFormatInfo.SetText(aText); } diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 065e61190c63..7880452389ce 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -411,9 +411,9 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, xMSF->createInstance("com.sun.star.document.FilterFactory"), UNO_QUERY_THROW); uno::Reference< container::XContainerQuery > xQuery(xFilterFactory, UNO_QUERY_THROW); OUString sCommand("matchByDocumentService=com.sun.star.text.TextDocument:iflags="); - sCommand += String::CreateFromInt32(SFX_FILTER_EXPORT); + sCommand += OUString::number(SFX_FILTER_EXPORT); sCommand += ":eflags="; - sCommand += String::CreateFromInt32(SFX_FILTER_NOTINFILEDLG); + sCommand += OUString::number(SFX_FILTER_NOTINFILEDLG); sCommand += ":default_first"; uno::Reference< container::XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand); const ::rtl::OUString sName(RTL_CONSTASCII_USTRINGPARAM("Name")); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 67fb05d7cf56..1d10f652069d 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -202,7 +202,7 @@ sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& ) sDBName += DB_DELIM; sDBName += (String)aData.sCommand; sDBName += DB_DELIM; - sDBName += String::CreateFromInt32(aData.nCommandType); + sDBName += OUString::number(aData.nCommandType); sDBName += DB_DELIM; if(sColumnName.Len()) { @@ -487,7 +487,7 @@ void SwFldDBPage::FillUserData() nTypeSel = USHRT_MAX; else nTypeSel = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData( nTypeSel ); - sData += String::CreateFromInt32( nTypeSel ); + sData += OUString::number( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 3f31e0c450b8..0304bc08f947 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -466,7 +466,7 @@ void SwFldDokInfPage::FillUserData() sData += ';'; SvTreeListEntry* pEntry = aTypeTLB.FirstSelected(); sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX; - sData += String::CreateFromInt32( nTypeSel ); + sData += OUString::number( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index b6fe5fdd249b..6a37ce214f19 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -335,10 +335,10 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) sal_Int32 nOff = GetCurField()->GetPar2().toInt32(); if( TYP_NEXTPAGEFLD == nTypeId && 1 != nOff ) aValueED.SetText( - String::CreateFromInt32(nOff - 1) ); + OUString::number(nOff - 1) ); else if( TYP_PREVPAGEFLD == nTypeId && -1 != nOff ) aValueED.SetText( - String::CreateFromInt32(nOff + 1) ); + OUString::number(nOff + 1) ); else aValueED.SetText(aEmptyStr); } @@ -351,7 +351,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) case TYP_CHAPTERFLD: aValueFT.SetText(SW_RESSTR(STR_LEVEL)); if (IsFldEdit()) - aLevelED.SetText(String::CreateFromInt32(((SwChapterField*)GetCurField())->GetLevel() + 1)); + aLevelED.SetText(OUString::number(((SwChapterField*)GetCurField())->GetLevel() + 1)); bLevel = sal_True; break; @@ -586,9 +586,9 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& ) nFormat = aNumFormatLB.GetFormat(); long nVal = static_cast< long >(aDateOffsetED.GetValue()); if (nTypeId == TYP_DATEFLD) - aVal = String::CreateFromInt32(nVal * 60 * 24); + aVal = OUString::number(nVal * 60 * 24); else - aVal = String::CreateFromInt32(nVal); + aVal = OUString::number(nVal); break; } @@ -601,7 +601,7 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& ) (TYP_PREVPAGEFLD == nTypeId || TYP_NEXTPAGEFLD == nTypeId)) { sal_Int32 nVal = aValueED.GetText().toInt32(); - aVal = String::CreateFromInt32(nVal); + aVal = OUString::number(nVal); } break; } @@ -648,7 +648,7 @@ void SwFldDokPage::FillUserData() nTypeSel = USHRT_MAX; else nTypeSel = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); - sData += String::CreateFromInt32( nTypeSel ); + sData += OUString::number( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index a631230d0db8..3b7279aecd54 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -654,7 +654,7 @@ void SwFldFuncPage::FillUserData() nTypeSel = USHRT_MAX; else nTypeSel = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); - sData += String::CreateFromInt32( nTypeSel ); + sData += OUString::number( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 03fb29231b10..a3470a023fb3 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -1477,7 +1477,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, nFormat = SVX_NUM_PAGEDESC; short nOff = (short)sPar2.ToInt32(); nOff += 1; - sPar2 = String::CreateFromInt32(nOff); + sPar2 = OUString::number(nOff); } break; @@ -1493,7 +1493,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat, nFormat = SVX_NUM_PAGEDESC; short nOff = (short)sPar2.ToInt32(); nOff -= 1; - sPar2 = String::CreateFromInt32(nOff); + sPar2 = OUString::number(nOff); } break; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 74a26b1f86fe..62d115466c1b 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -464,7 +464,7 @@ void SwFldRefPage::UpdateSubType() } } if (IsFldEdit() && !sOldSel.Len()) - sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1 ); + sOldSel = OUString::number( pRefFld->GetSeqNo() + 1 ); aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); @@ -602,7 +602,7 @@ void SwFldRefPage::UpdateSubType() } if (IsFldEdit() && !sOldSel.Len()) - sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1); + sOldSel = OUString::number( pRefFld->GetSeqNo() + 1); } } } @@ -834,13 +834,13 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) if (pSh->GetSeqFtnList(aArr) && aArr.SeekEntry(aElem, &nPos)) { - aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo ); + aVal = OUString::number( aArr[nPos]->nSeqNo ); if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo()) bModified = sal_True; // can happen with fields of which the references were deleted } else if (IsFldEdit()) - aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); + aVal = OUString::number( pRefFld->GetSeqNo() ); } else if (REFFLDFLAG_ENDNOTE == nTypeId) // endnotes { @@ -855,13 +855,13 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) if (pSh->GetSeqFtnList(aArr, true) && aArr.SeekEntry(aElem, &nPos)) { - aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo ); + aVal = OUString::number( aArr[nPos]->nSeqNo ); if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo()) bModified = sal_True; // can happen with fields of which the reference was deleted } else if (IsFldEdit()) - aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); + aVal = OUString::number( pRefFld->GetSeqNo() ); } // #i83479# else if ( nTypeId == REFFLDFLAG_HEADING ) @@ -922,13 +922,13 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) if (pType->GetSeqFldList(aArr) && aArr.SeekEntry(aElem, &nPos)) { - aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo ); + aVal = OUString::number( aArr[nPos]->nSeqNo ); if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo()) bModified = sal_True; // can happen with fields of which the reference was deleted } else if (IsFldEdit()) - aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); + aVal = OUString::number( pRefFld->GetSeqNo() ); } } } @@ -936,7 +936,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) if (IsFldEdit() && nTypeId == TYP_GETREFFLD) { aVal.Insert('|', 0); - aVal.Insert(String::CreateFromInt32(nSubType), 0); + aVal.Insert(OUString::number(nSubType), 0); } if (!IsFldEdit() || bModified || @@ -974,7 +974,7 @@ void SwFldRefPage::FillUserData() nTypeSel = USHRT_MAX; else nTypeSel = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); - sData += String::CreateFromInt32( nTypeSel ); + sData += OUString::number( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 23a9c5910b67..a3242c2b5474 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -74,7 +74,7 @@ SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) : sOldNameFT = aNameFT.GetText(); for (sal_uInt16 i = 1; i <= MAXLEVEL; i++) - aChapterLevelLB.InsertEntry(String::CreateFromInt32(i)); + aChapterLevelLB.InsertEntry(OUString::number(i)); aChapterLevelLB.SelectEntryPos(0); //enable 'active' language selection @@ -500,7 +500,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { bValue = sal_True; // SubType OFF - knows no Offset if (IsFldEdit()) - aValueED.SetText(String::CreateFromInt32(((SwRefPageSetField*)GetCurField())->GetOffset())); + aValueED.SetText(OUString::number(((SwRefPageSetField*)GetCurField())->GetOffset())); } } break; @@ -1281,7 +1281,7 @@ void SwFldVarPage::FillUserData() nTypeSel = USHRT_MAX; else nTypeSel = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData( nTypeSel ); - sData += String::CreateFromInt32( nTypeSel ); + sData += OUString::number( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 3349deb8b83e..873236ca2042 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -883,17 +883,17 @@ void SwColumnPage::SetLabels( sal_uInt16 nVis ) { rtl::OUString sLbl( '~' ); - String sLbl2( String::CreateFromInt32( nVis + 1 )); + String sLbl2( OUString::number( nVis + 1 )); String tmp1(sLbl2); sLbl2.Insert(sLbl, sLbl2.Len() - 1); m_pLbl1->SetText(sLbl2); - sLbl2 = String::CreateFromInt32( nVis + 2 ); + sLbl2 = OUString::number( nVis + 2 ); String tmp2(sLbl2); sLbl2.Insert(sLbl, sLbl2.Len() - 1); m_pLbl2->SetText(sLbl2); - sLbl2 = String::CreateFromInt32( nVis + 3 ); + sLbl2 = OUString::number( nVis + 3 ); String tmp3(sLbl2); sLbl2.Insert(sLbl, sLbl2.Len() - 1); m_pLbl3->SetText(sLbl2); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 8117e16f2fb1..af90e5552d4c 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -431,7 +431,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV, m_pLbLevel->InsertEntry(sNone); for( sal_uInt16 n = 0; n < MAXLEVEL; ++n ) - m_pLbLevel->InsertEntry( String::CreateFromInt32(n+1) ); + m_pLbLevel->InsertEntry( OUString::number(n+1) ); SwSetExpFieldType* pFldType = (SwSetExpFieldType*)rSh.GetFldType( RES_SETEXPFLD, aFldTypeName ); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index bc7587fd1d4b..921f0bac1d28 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -139,7 +139,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl) rtl::OUString sSectionName("IndexSection_"); for(int i = 0; i < 7; ++i ) { - String sTmp( sSectionName ); sTmp += String::CreateFromInt32(i); + String sTmp( sSectionName ); sTmp += OUString::number(i); uno::Any aSection = xSections->getByName( sTmp ); aSection >>= pxIndexSectionsArr[i]->xContainerSection; } @@ -440,7 +440,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( for(sal_uInt16 i = 1; i < nEndLevel; i++) { String sPropName(rtl::OUString("ParaStyleLevel")); - sPropName += String::CreateFromInt32( i ); + sPropName += OUString::number( i ); lcl_SetProp(xInfo, xIdxProps, rtl::OUStringToOString(sPropName, RTL_TEXTENCODING_ASCII_US).getStr(), diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 165fdb2c1dd8..83d9e358aa8e 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -729,7 +729,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, nWidth--; rHB.InsertItem( 100, sHBFirst, 4 * nWidth ); for( i = 1; i <= MAXLEVEL; i++) - rHB.InsertItem( 100 + i, String::CreateFromInt32(i), nWidth ); + rHB.InsertItem( 100 + i, OUString::number(i), nWidth ); rHB.Show(); SwIndexTreeLB& rTLB = aHeaderTree.GetTreeListBox(); @@ -2107,10 +2107,10 @@ void SwTOXEntryTabPage::ActivatePage( const SfxItemSet& /*rSet*/) if(i == 1) aLevelLB.InsertEntry( sDelimStr ); else - aLevelLB.InsertEntry( String::CreateFromInt32(i - 1) ); + aLevelLB.InsertEntry( OUString::number(i - 1) ); } else - aLevelLB.InsertEntry(String::CreateFromInt32(i)); + aLevelLB.InsertEntry(OUString::number(i)); } if(bToxIsAuthorities) { @@ -3328,7 +3328,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) #if OSL_DEBUG_LEVEL > 1 //find all start/end positions and print it String sMessage(rtl::OUString("Space: ")); - sMessage += String::CreateFromInt32(nSpace); + sMessage += OUString::number(nSpace); sMessage += rtl::OUString(" | "); for (ctrl_const_iterator it = aControlList.begin(); it != aControlList.end(); ++it) @@ -3338,9 +3338,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn ) long nDebugXPos = pDebugCtrl->GetPosPixel().X(); long nDebugWidth = pDebugCtrl->GetSizePixel().Width(); - sMessage += String::CreateFromInt32( nDebugXPos ); + sMessage += OUString::number( nDebugXPos ); sMessage += rtl::OUString(" "); - sMessage += String::CreateFromInt32(nDebugXPos + nDebugWidth); + sMessage += OUString::number(nDebugXPos + nDebugWidth); sMessage += rtl::OUString(" | "); } @@ -3726,7 +3726,7 @@ void SwTOXStylesTabPage::ActivatePage( const SfxItemSet& ) else { aStr = SW_RESSTR(STR_LEVEL); - aStr += String::CreateFromInt32( + aStr += OUString::number( TOX_INDEX == m_pCurrentForm->GetTOXType() ? i - 1 : i ); } String aCpy( aStr ); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 7339ae7933be..06b4083062e5 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1643,7 +1643,7 @@ String SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) const if( AUTH_FIELD_AUTHORITY_TYPE == eField ) { OSL_ENSURE(pTypeListBox, "No ListBox"); - sRet = String::CreateFromInt32(pTypeListBox->GetSelectEntryPos()); + sRet = OUString::number(pTypeListBox->GetSelectEntryPos()); } else if( AUTH_FIELD_IDENTIFIER == eField && !m_bNewEntryMode) { diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 2b47249baba9..a2c1f1789f3f 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -515,7 +515,7 @@ SwSpellPopup::SwSpellPopup( //ADD NEW LANGUAGE MENU ITEM /////////////////////////////////////////////////////////////////////////// - String aScriptTypesInUse( String::CreateFromInt32( pWrtSh->GetScriptType() ) ); + String aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); SvtLanguageTable aLanguageTable; // get keyboard language @@ -670,7 +670,7 @@ aInfo16( SW_RES(IMG_INFO_16) ) //ADD NEW LANGUAGE MENU ITEM /////////////////////////////////////////////////////////////////////////// - String aScriptTypesInUse( String::CreateFromInt32( pWrtSh->GetScriptType() ) ); + String aScriptTypesInUse( OUString::number( pWrtSh->GetScriptType() ) ); SvtLanguageTable aLanguageTable; // get keyboard language diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index e27f84e80ed8..c3ef20f16d40 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -211,7 +211,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl) { String sGroup(m_pNameED->GetText()); sGroup += GLOS_DELIM; - sGroup += String::CreateFromInt32(m_pPathLB->GetSelectEntryPos()); + sGroup += OUString::number(m_pPathLB->GetSelectEntryPos()); OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!"); m_InsertedArr.push_back(sGroup); String sTemp(m_pNameED->GetText()); @@ -294,7 +294,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) String sNewTitle(sNewName); sNewName += GLOS_DELIM; - sNewName += String::CreateFromInt32(m_pPathLB->GetSelectEntryPos()); + sNewName += OUString::number(m_pPathLB->GetSelectEntryPos()); OSL_ENSURE(!pGlosHdl->FindGroupName(sNewName), "group already available!"); // if the name to be renamed is among the new ones - replace diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx index 0659eea07e93..46f214c21692 100644 --- a/sw/source/ui/misc/glosdoc.cxx +++ b/sw/source/ui/misc/glosdoc.cxx @@ -258,7 +258,7 @@ sal_Bool SwGlossaries::RenameGroupDoc( rNewGroup = sNewFileName.Copy(0, nFileNameLen); rNewGroup += GLOS_DELIM; - rNewGroup += String::CreateFromInt32(nNewPath); + rNewGroup += OUString::number(nNewPath); if (m_GlosArr.empty()) { GetNameList(); @@ -293,7 +293,7 @@ sal_Bool SwGlossaries::DelGroupDoc(const String &rName) String aTmp( rName.GetToken(0, GLOS_DELIM)); String aName(aTmp); aName += GLOS_DELIM; - aName += String::CreateFromInt32(nPath); + aName += OUString::number(nPath); aTmp += SwGlossaries::GetExtension(); sFileURL += INET_PATH_TOKEN; @@ -368,7 +368,7 @@ std::vector<String> & SwGlossaries::GetNameList() String *pTitle = *filesIt; String sName( pTitle->Copy( 0, pTitle->Len() - sExt.Len() )); sName += GLOS_DELIM; - sName += String::CreateFromInt32( static_cast<sal_Int16>(i) ); + sName += OUString::number( static_cast<sal_Int16>(i) ); m_GlosArr.push_back(sName); // don't need any more these pointers diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index ab65355f83fd..ee5a1c077a22 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -268,7 +268,7 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) String *pGlosGroup = ::GetCurrGlosGroup(); (*pGlosGroup) = pGroupData->sGroupName; (*pGlosGroup) += GLOS_DELIM; - (*pGlosGroup) += String::CreateFromInt32(pGroupData->nPathIdx); + (*pGlosGroup) += OUString::number(pGroupData->nPathIdx); pGlossaryHdl->SetCurGroup(*pGlosGroup); // set current text block bReadOnly = pGlossaryHdl->IsReadOnly(); @@ -653,7 +653,7 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) GroupUserData* pGroupData = (GroupUserData*)pEntry->GetUserData(); String sGroup = pGroupData->sGroupName; sGroup += GLOS_DELIM; - sGroup += String::CreateFromInt32(pGroupData->nPathIdx); + sGroup += OUString::number(pGroupData->nPathIdx); if(sGroup == sNewGroup) { m_pCategoryBox->Select(pEntry); @@ -939,7 +939,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag( GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData(); String sEntry(pGroupData->sGroupName); sEntry += GLOS_DELIM; - sEntry += String::CreateFromInt32(pGroupData->nPathIdx); + sEntry += OUString::number(pGroupData->nPathIdx); sal_Int8 nDragOption = DND_ACTION_COPY; eRet = SV_DRAGDROP_CTRL_COPY; if(!pDlg->pGlossaryHdl->IsReadOnly(&sEntry)) @@ -987,7 +987,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData(); String sSourceGroup(pGroupData->sGroupName); sSourceGroup += GLOS_DELIM; - sSourceGroup += String::CreateFromInt32(pGroupData->nPathIdx); + sSourceGroup += OUString::number(pGroupData->nPathIdx); pDlg->pGlossaryHdl->SetCurGroup(sSourceGroup); String sTitle(GetEntryText(pEntry)); String sShortName(*(String*)pEntry->GetUserData()); @@ -995,7 +995,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, GroupUserData* pDestData = (GroupUserData*)pDestParent->GetUserData(); String sDestName = pDestData->sGroupName; sDestName += GLOS_DELIM; - sDestName += String::CreateFromInt32(pDestData->nPathIdx); + sDestName += OUString::number(pDestData->nPathIdx); bRet = pDlg->pGlossaryHdl->CopyOrMove( sSourceGroup, sShortName, sDestName, sTitle, sal_True ); if(bRet) @@ -1033,7 +1033,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, GroupUserData* pGroupData = (GroupUserData*)pSrcParent->GetUserData(); String sSourceGroup(pGroupData->sGroupName); sSourceGroup += GLOS_DELIM; - sSourceGroup += String::CreateFromInt32(pGroupData->nPathIdx); + sSourceGroup += OUString::number(pGroupData->nPathIdx); pDlg->pGlossaryHdl->SetCurGroup(sSourceGroup); String sTitle(GetEntryText(pEntry)); @@ -1042,7 +1042,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, GroupUserData* pDestData = (GroupUserData*)pDestParent->GetUserData(); String sDestName = pDestData->sGroupName; sDestName += GLOS_DELIM; - sDestName += String::CreateFromInt32(pDestData->nPathIdx); + sDestName += OUString::number(pDestData->nPathIdx); bRet = pDlg->pGlossaryHdl->CopyOrMove( sSourceGroup, sShortName, sDestName, sTitle, sal_False ); @@ -1066,7 +1066,7 @@ String SwGlossaryDlg::GetCurrGrpName() const GroupUserData* pGroupData = (GroupUserData*)pEntry->GetUserData(); sRet = pGroupData->sGroupName; sRet += GLOS_DELIM; - sRet += String::CreateFromInt32(pGroupData->nPathIdx); + sRet += OUString::number(pGroupData->nPathIdx); } return sRet; } diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index db24739fb477..7b0aa290f323 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -150,9 +150,9 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, // insert levels for(sal_uInt16 i = 1; i <= MAXLEVEL; i++) - m_pLevelLB->InsertEntry(String::CreateFromInt32(i)); + m_pLevelLB->InsertEntry(OUString::number(i)); String sEntry(rtl::OUString("1 - ")); - sEntry += String::CreateFromInt32(MAXLEVEL); + sEntry += OUString::number(MAXLEVEL); m_pLevelLB->InsertEntry(sEntry); m_pLevelLB->SelectEntry(sEntry); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index b30126c4248c..f460f79d6923 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -783,10 +783,10 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell) { m_pCollBox->InsertEntry( SwStyleNameMapper::GetUIName( static_cast< sal_uInt16 >(RES_POOLCOLL_HEADLINE1 + i), aEmptyStr )); - m_pLevelLB->InsertEntry( String::CreateFromInt32(i + 1) ); + m_pLevelLB->InsertEntry( OUString::number(i + 1) ); } sStr.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "1 - " )); - sStr += String::CreateFromInt32(MAXLEVEL); + sStr += OUString::number(MAXLEVEL); m_pLevelLB->InsertEntry( sStr ); // query the texttemplates' outlining levels diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index b03d4d57a0e7..8156657aac89 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -822,7 +822,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ) { SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, - String::CreateFromInt32(aRedlines.size())); + OUString::number(aRedlines.size())); aTmpStr = aRewriter.Apply(String(SW_RES(STR_N_REDLINES))); } @@ -1226,11 +1226,11 @@ void SwRedlineAcceptDlg::FillInfo(String &rExtraData) const sal_uInt16 nCount = pTable->TabCount(); - rExtraData += String::CreateFromInt32(nCount); + rExtraData += OUString::number(nCount); rExtraData += ';'; for(sal_uInt16 i = 0; i < nCount; i++) { - rExtraData += String::CreateFromInt32( pTable->GetTab(i) ); + rExtraData += OUString::number( pTable->GetTab(i) ); rExtraData += ';'; } rExtraData += ')'; diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 17b170e3f48e..7f41f84bb618 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -656,7 +656,7 @@ SwZoomBox_Impl::SwZoomBox_Impl( { 25, 50, 75, 100, 150, 200 }; for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++) { - String sEntry = String::CreateFromInt32(aZoomValues[i]); + String sEntry = OUString::number(aZoomValues[i]); sEntry += '%'; InsertEntry(sEntry); } @@ -772,7 +772,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, SwZoomBox_Impl* pBox = (SwZoomBox_Impl*)GetToolBox().GetItemWindow( GetId() ); if(SFX_ITEM_AVAILABLE <= eState) { - String sZoom(String::CreateFromInt32(((const SfxUInt16Item*)pState)->GetValue())); + String sZoom(OUString::number(((const SfxUInt16Item*)pState)->GetValue())); sZoom += '%'; pBox->SetText(sZoom); pBox->SaveValue(); diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index e9db18267abe..5b1c949b4205 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -203,7 +203,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) { sName = sOldName; sName += '_'; - sName += String::CreateFromInt32(i++); + sName += OUString::number(i++); } rSh.SetFlyName(sName); } diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index 469aed3e78fa..01c14facd349 100644 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -67,7 +67,7 @@ namespace SwLangHelper // the value of used script types const sal_uInt16 nScriptType =pOLV->GetSelectedScriptType(); - String aScriptTypesInUse( String::CreateFromInt32( nScriptType ) );//pEditEngine->GetScriptType(aSelection) + String aScriptTypesInUse( OUString::number( nScriptType ) );//pEditEngine->GetScriptType(aSelection) SvtLanguageTable aLangTable; diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index f230189a05ea..ba0c85c0b596 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -214,7 +214,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) FN_PARAM_3, sal_False, &pItem )) nCommand = ((SfxInt32Item*)pItem)->GetValue(); aPar1 += DB_DELIM; - aPar1 += String::CreateFromInt32(nCommand); + aPar1 += OUString::number(nCommand); aPar1 += DB_DELIM; if( SFX_ITEM_SET == pArgs->GetItemState( FN_PARAM_2, sal_False, &pItem )) diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 5a147adb9ea5..7e168d16dcc1 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -1308,7 +1308,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) case SID_LANGUAGE_STATUS: { // the value of used script types - String aScriptTypesInUse( String::CreateFromInt32( rSh.GetScriptType() ) ); + String aScriptTypesInUse( OUString::number( rSh.GetScriptType() ) ); SvtLanguageTable aLangTable; diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index 78445bbab017..46868899508a 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -201,7 +201,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) sDBName += DB_DELIM; sDBName += (String)sCommandArg; sDBName += DB_DELIM; - sDBName += String::CreateFromInt32(nCommandTypeArg); + sDBName += OUString::number(nCommandTypeArg); sDBName += DB_DELIM; sDBName += (String)sColumnName; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 61d6b4748342..3efc6190b94e 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -871,7 +871,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox ) for( sal_uInt16 i = 0; (i < nNoOfVisibleCols ) && ( i < MET_FIELDS); i++ ) { String sEntry = rtl::OUString('~'); - String sIndex = String::CreateFromInt32( aValueTbl[i] + 1 ); + String sIndex = OUString::number( aValueTbl[i] + 1 ); sEntry += sIndex; m_pTextArr[i]->SetText( sEntry ); @@ -1360,7 +1360,7 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) // Repeat Heading if(m_pHeadLineCB->IsChecked() != m_pHeadLineCB->GetSavedValue() || - String::CreateFromInt32( static_cast< sal_Int32 >(m_pRepeatHeaderNF->GetValue()) ) != m_pRepeatHeaderNF->GetSavedValue() ) + OUString::number( static_cast< sal_Int32 >(m_pRepeatHeaderNF->GetValue()) ) != m_pRepeatHeaderNF->GetSavedValue() ) { bModified |= 0 != rSet.Put( SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, m_pHeadLineCB->IsChecked()? sal_uInt16(m_pRepeatHeaderNF->GetValue()) : 0 )); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index f15c30df0456..57545a0b4bdf 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -706,7 +706,7 @@ MAKENUMSTR: pNumFmt->GetOutputString( nVal, nKey, cellString, &pDummy ); } else - cellString = String::CreateFromInt32((sal_Int32)nVal); + cellString = OUString::number((sal_Int32)nVal); break; } diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 74c92bb20adc..6894a6512580 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -506,9 +506,9 @@ void SwPagePreViewWin::MouseButtonDown( const MouseEvent& rMEvt ) { // close page preview, set new cursor position and switch to // normal view. - String sNewCrsrPos( String::CreateFromInt32( aDocPos.X() )); + String sNewCrsrPos( OUString::number( aDocPos.X() )); ((( sNewCrsrPos += ';' ) - += String::CreateFromInt32( aDocPos.Y() )) ) + += OUString::number( aDocPos.Y() )) ) += ';'; mrView.SetNewCrsrPos( sNewCrsrPos ); @@ -1448,7 +1448,7 @@ IMPL_LINK( SwPagePreView, ScrollHdl, SwScrollbar *, pScrollbar ) sal_uInt16 nThmbPos = (sal_uInt16)pScrollbar->GetThumbPos(); if( 1 == aViewWin.GetCol() || !nThmbPos ) ++nThmbPos; - sStateStr += String::CreateFromInt32( nThmbPos ); + sStateStr += OUString::number( nThmbPos ); Point aPos = pScrollbar->GetParent()->OutputToScreenPixel( pScrollbar->GetPosPixel()); aPos.Y() = pScrollbar->OutputToScreenPixel(pScrollbar->GetPointerPosPixel()).Y(); diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index d78e59cb58d1..66834e63c00d 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -167,7 +167,7 @@ static void lcl_PrintHeader( OutputDevice &rOutDev, sal_uInt16 nPages, sal_uInt1 String aPageStr( rtl::OUString(" [") ); aPageStr += String( SW_RES( STR_PAGE ) ); aPageStr += ' '; - aPageStr += String::CreateFromInt32( nCurPage ); + aPageStr += OUString::number( nCurPage ); aPageStr += ']'; aPos.X() += rOutDev.GetTextWidth( rTitle ); rOutDev.DrawText( aPos, aPageStr ); @@ -446,10 +446,10 @@ void SwSrcView::GetState(SfxItemSet& rSet) { String aPos( SW_RES(STR_SRCVIEW_ROW) ); TextSelection aSel = pTextView->GetSelection(); - aPos += String::CreateFromInt32( aSel.GetEnd().GetPara()+1 ); + aPos += OUString::number( aSel.GetEnd().GetPara()+1 ); aPos += rtl::OUString(" : "); aPos += String(SW_RES(STR_SRCVIEW_COL)); - aPos += String::CreateFromInt32( aSel.GetEnd().GetIndex()+1 ); + aPos += OUString::number( aSel.GetEnd().GetIndex()+1 ); SfxStringItem aItem( nWhich, aPos ); rSet.Put( aItem ); } diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index fe90b5ddf1f0..f8b7b3e343e6 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -1112,21 +1112,21 @@ void SwView::WriteUserData( String &rUserData, sal_Bool bBrowse ) const SwRect& rRect = pWrtShell->GetCharRect(); const Rectangle& rVis = GetVisArea(); - rUserData = String::CreateFromInt32( rRect.Left() ); + rUserData = OUString::number( rRect.Left() ); rUserData += ';'; - rUserData += String::CreateFromInt32( rRect.Top() ); + rUserData += OUString::number( rRect.Top() ); rUserData += ';'; - rUserData += String::CreateFromInt32( pWrtShell->GetViewOptions()->GetZoom() ); + rUserData += OUString::number( pWrtShell->GetViewOptions()->GetZoom() ); rUserData += ';'; - rUserData += String::CreateFromInt32( rVis.Left() ); + rUserData += OUString::number( rVis.Left() ); rUserData += ';'; - rUserData += String::CreateFromInt32( rVis.Top() ); + rUserData += OUString::number( rVis.Top() ); rUserData += ';'; - rUserData += String::CreateFromInt32( bBrowse ? SAL_MIN_INT32 : rVis.Right()); + rUserData += OUString::number( bBrowse ? SAL_MIN_INT32 : rVis.Right()); rUserData += ';'; - rUserData += String::CreateFromInt32( bBrowse ? SAL_MIN_INT32 : rVis.Bottom()); + rUserData += OUString::number( bBrowse ? SAL_MIN_INT32 : rVis.Bottom()); rUserData += ';'; - rUserData += String::CreateFromInt32( + rUserData += OUString::number( (sal_uInt16)pWrtShell->GetViewOptions()->GetZoomType());//eZoom; rUserData += ';'; rUserData += FRMTYPE_NONE == pWrtShell->GetSelFrmType() ? '0' : '1'; diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index ed0245dc3441..6a5e19b88714 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -186,15 +186,15 @@ String SwView::GetPageStr( sal_uInt16 nPg, sal_uInt16 nLogPg, if( rDisplay.Len() ) aStr += rDisplay; else - aStr += String::CreateFromInt32(nLogPg); + aStr += OUString::number(nLogPg); if( nLogPg && nLogPg != nPg ) { aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM(" ")); - aStr += String::CreateFromInt32(nPg); + aStr += OUString::number(nPg); } aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM(" / ")); - aStr += String::CreateFromInt32( GetWrtShell().GetPageCnt() ); + aStr += OUString::number( GetWrtShell().GetPageCnt() ); return aStr; } @@ -1472,7 +1472,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) if( sStr.Len() ) sStr.AppendAscii(sStatusDelim); sStr += SW_RESSTR(STR_NUM_LEVEL); - sStr += String::CreateFromInt32( nNumLevel + 1 ); + sStr += OUString::number( nNumLevel + 1 ); } } @@ -1489,7 +1489,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet) } else sStr += SW_RESSTR(STR_NUM_OUTLINE); - sStr += String::CreateFromInt32( nOutlineLevel); + sStr += OUString::number( nOutlineLevel); } //<-end ,zhaojianwei diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx index 5488033ef7a5..e584f8d279bf 100644 --- a/sw/source/ui/uiview/viewsrch.cxx +++ b/sw/source/ui/uiview/viewsrch.cxx @@ -338,7 +338,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool bNoMessage) String aText( SW_RES( STR_NB_REPLACED ) ); const xub_StrLen nPos = aText.Search( rtl::OUString("XX") ); aText.Erase( nPos, 2 ); - aText.Insert( String::CreateFromInt32( nFound ), nPos ); + aText.Insert( OUString::number( nFound ), nPos ); Window* pParentWindow = GetParentWindow( pSrchDlg ); InfoBox( pParentWindow, aText ).Execute(); } diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 6d36edbb606a..ce295e9313e4 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -1055,7 +1055,7 @@ static String lcl_CreateOutlineString( sal_uInt16 nIndex, long nVal = aNumVector[nLevel]; nVal ++; nVal -= pOutlRule->Get(nLevel).GetStart(); - sEntry += String::CreateFromInt32( nVal ); + sEntry += OUString::number( nVal ); sEntry += '.'; } sEntry += rOutlineNodes[ nIndex ]-> diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 07502f07284a..6fd340d727b2 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -974,7 +974,7 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) sal_uInt16 i; for(i = 1; i <= MAXLEVEL; i++ ) { - pSubPop1->InsertItem( i + 100, String::CreateFromInt32(i)); + pSubPop1->InsertItem( i + 100, OUString::number(i)); } pSubPop1->CheckItem(100 + nOutlineLevel); for(i=0; i < 3; i++ ) @@ -1598,7 +1598,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, sal_uInt16 nVal = (sal_uInt16)aNumVector[nLevel]; nVal ++; nVal = nVal - pOutlRule->Get(nLevel).GetStart(); - sEntry += String::CreateFromInt32( nVal ); + sEntry += OUString::number( nVal ); sEntry += '.'; } } @@ -2497,7 +2497,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) sEntry = ((SwGraphicContent*)pUserData)->GetLink(); #if OSL_DEBUG_LEVEL > 1 sEntry += ' '; - sEntry += String::CreateFromInt32( + sEntry += OUString::number( ((SwGraphicContent*)pUserData)->GetYPos()); #endif bRet = true; @@ -2505,7 +2505,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) #if OSL_DEBUG_LEVEL > 1 case CONTENT_TYPE_TABLE: case CONTENT_TYPE_FRAME: - sEntry = String::CreateFromInt32( + sEntry = OUString::number( ((SwContent*)pUserData)->GetYPos() ); bRet = true; break; @@ -2522,7 +2522,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) else { sal_uInt16 nMemberCount = ((SwContentType*)pUserData)->GetMemberCount(); - sEntry = String::CreateFromInt32(nMemberCount); + sEntry = OUString::number(nMemberCount); sEntry += ' '; sEntry += nMemberCount == 1 ? ((SwContentType*)pUserData)->GetSingleName() diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index e1cf4c48407a..f978c6f2ffa9 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -1321,7 +1321,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen nAddNumber++; sTempSectionName = sSectionName; sTempSectionName += ':'; - sTempSectionName += String::CreateFromInt32( nAddNumber ); + sTempSectionName += OUString::number( nAddNumber ); } else nCount++; diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx index e27eeb9c02da..831e4baf744b 100644 --- a/sw/source/ui/utlui/gloslst.cxx +++ b/sw/source/ui/utlui/gloslst.cxx @@ -288,7 +288,7 @@ void SwGlossaryList::Update() aFoundGroupNames.push_back(sName); sName += GLOS_DELIM; - sName += String::CreateFromInt32( static_cast<sal_uInt16>(nPath) ); + sName += OUString::number( static_cast<sal_uInt16>(nPath) ); AutoTextGroup* pFound = FindGroup( sName ); if( !pFound ) { diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index 852884f2440f..42bb787ccec5 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -197,7 +197,7 @@ String ShellResource::GetPageDescName( sal_uInt16 nNo, PageNameMode eMode ) break; } - sRet.SearchAndReplaceAscii( "$(ARG1)", String::CreateFromInt32( nNo )); + sRet.SearchAndReplaceAscii( "$(ARG1)", OUString::number( nNo )); return sRet; } diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 108b17707530..380f9ba7cfb5 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -414,7 +414,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) PopupMenu *pMenu = new PopupMenu; for (sal_uInt16 i = 101; i <= 100 + MAXLEVEL; i++) { - pMenu->InsertItem( i, String::CreateFromInt32(i - 100) ); + pMenu->InsertItem( i, OUString::number(i - 100) ); pMenu->SetHelpId( i, HID_NAVI_OUTLINES ); } pMenu->CheckItem( aContentTree.GetOutlineLevel() + 100 ); diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index f5b144416a6e..69f1331f0763 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -474,7 +474,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt) i < (sizeof(nZoomValues)/sizeof(nZoomValues[0])); ++i) { String sTemp; - sTemp = String::CreateFromInt32(nZoomValues[i]); + sTemp = OUString::number(nZoomValues[i]); sTemp += rtl::OUString(" %"); aSubPop1.InsertItem( ITEM_ZOOM + i + 1, sTemp); if(nZoom == nZoomValues[i]) |