diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-20 13:55:09 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-21 15:04:17 +0000 |
| commit | 63bcb139b941a2eff1b5ad367046bca067e7d1f8 (patch) | |
| tree | e3ecd8d2804dc60be4233508af0e78fdae0c9838 | |
| parent | d912979b4fefaaf3011fdca2005db6699ea45405 (diff) | |
Replaced O[U]String::valueOf( static_cast<> ) with O[U]String::number()
Change-Id: I2f11f2f15a652a9edc3c7e5b67c854debeed20de
Reviewed-on: https://gerrit.libreoffice.org/1784
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
82 files changed, 189 insertions, 198 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index ec9c9d6be22c..961b5ed7fa97 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1521,7 +1521,7 @@ sal_Bool BasicManager::LoadLib( sal_uInt16 nLib ) else { StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBLOAD, OUString(), ERRCODE_BUTTON_OK ); - aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_LIBNOTFOUND, OUString::valueOf(static_cast<sal_Int32>(nLib)))); + aErrors.push_back(BasicError(*pErrInf, BASERR_REASON_LIBNOTFOUND, OUString::number(nLib))); } return bDone; } diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 12cb5da4e92b..a269c74b9133 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1663,7 +1663,7 @@ void StarBASIC::MakeErrorText( SbError nId, const OUString& aMsg ) } else if( nOldID != 0 ) { - OUString aStdMsg = "Fehler " + OUString::valueOf(static_cast<sal_Int32>(nOldID)) + + OUString aStdMsg = "Fehler " + OUString::number(nOldID) + ": Kein Fehlertext verfuegbar!"; GetSbData()->aErrMsg = aStdMsg; } diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 2ce01fc4d4ed..69f99201309d 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -830,7 +830,7 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill ) << ( aNameStr.isEmpty() ? "<unnamed>" : aNameStr.getStr() ) << "', " << "of class '" << aClassNameStr.getStr() << "', " << "counts " - << rtl::OString::valueOf(static_cast<sal_Int64>(GetRefCount())).getStr() + << OString::number(GetRefCount()).getStr() << " refs, "; if ( GetParent() ) { diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx index 64b1e11b3b88..58d16efdfe9f 100644 --- a/configmgr/source/writemodfile.cxx +++ b/configmgr/source/writemodfile.cxx @@ -174,7 +174,7 @@ void writeValueContent(oslFileHandle handle, sal_Bool value) { } void writeValueContent(oslFileHandle handle, sal_Int16 value) { - writeData(handle, rtl::OString::valueOf(static_cast< sal_Int32 >(value))); + writeData(handle, OString::number(value)); } void writeValueContent(oslFileHandle handle, sal_Int32 value) { @@ -201,7 +201,7 @@ void writeValueContent(oslFileHandle handle, OUString const & value) { writeData( handle, RTL_CONSTASCII_STRINGPARAM("<unicode oor:scalar=\"")); writeData( - handle, rtl::OString::valueOf(static_cast< sal_Int32 >(c))); + handle, OString::number(c)); writeData(handle, RTL_CONSTASCII_STRINGPARAM("\"/>")); i = j + 1; } else if (c == '\x0D') { diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 7e290b90f819..0cb4630d1823 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -395,7 +395,7 @@ void ODbaseIndex::createINFEntry() while (aNewEntry.isEmpty()) { aNewEntry = rtl::OString(RTL_CONSTASCII_STRINGPARAM("NDX")); - aNewEntry += rtl::OString::valueOf(static_cast<sal_Int32>(++nSuffix)); + aNewEntry += OString::number(++nSuffix); for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++) { aKeyName = aInfFile.GetKeyName(i); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 499b238284cf..7ee5ed5beaaf 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1956,7 +1956,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, if (!m_pMemoStream || !WriteMemo(thisColVal, nBlockNo)) break; - rtl::OString aBlock(rtl::OString::valueOf(static_cast<sal_Int32>(nBlockNo))); + rtl::OString aBlock(OString::number(nBlockNo)); //align aBlock at the right of a nLen sequence, fill to the left with '0' rtl::OStringBuffer aStr; comphelper::string::padToLength(aStr, nLen - aBlock.getLength(), '0'); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 123079ba5cde..9d444d45a3a2 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -3256,15 +3256,12 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) void SvxCharPositionPage::FillUserData() { - const sal_Unicode cTok = ';'; - - OUString sUser( OUString::valueOf( static_cast<sal_Int32>(m_nSuperEsc)) ); - sUser += OUString( cTok ); - sUser += OUString::valueOf( static_cast<sal_Int32>(m_nSubEsc) ); - sUser += OUString (cTok ); - sUser += OUString::valueOf( static_cast<sal_Int32>(m_nSuperProp) ); - sUser += OUString ( cTok ); - sUser += OUString::valueOf( static_cast<sal_Int32>(m_nSubProp) ); + const OUString cTok( ";" ); + + OUString sUser = OUString::number( m_nSuperEsc ) + cTok + + OUString::number( m_nSubEsc ) + cTok + + OUString::number( m_nSuperProp ) + cTok + + OUString::number( m_nSubProp ); SetUserData( sUser ); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 03dcc8d298e4..4dad881a70d3 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -972,8 +972,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa m_pEdLeadZeroes->Enable(); m_pBtnNegRed->Enable(); m_pBtnThousand->Enable(); - m_pEdDecimals->SetText( OUString::valueOf( static_cast<sal_Int32>(nDecimals) ) ); - m_pEdLeadZeroes->SetText( OUString::valueOf( static_cast<sal_Int32>(nZeroes) ) ); + m_pEdDecimals->SetText( OUString::number( nDecimals ) ); + m_pEdLeadZeroes->SetText( OUString::number( nZeroes ) ); m_pBtnNegRed->Check( bNegRed ); m_pBtnThousand->Check( bThousand ); break; @@ -994,8 +994,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool bCheckCatChange /*= sa m_pEdLeadZeroes->Disable(); m_pBtnNegRed->Disable(); m_pBtnThousand->Disable(); - m_pEdDecimals->SetText( OUString::valueOf( static_cast<sal_Int32>(0) ) ); - m_pEdLeadZeroes->SetText( OUString::valueOf( static_cast<sal_Int32>(0) ) ); + m_pEdDecimals->SetText( OUString::number( 0 ) ); + m_pEdLeadZeroes->SetText( OUString::number( 0 ) ); m_pBtnNegRed->Check( sal_False ); m_pBtnThousand->Check( sal_False ); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index b7bd0723d7ab..8e9fc4a6400b 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1266,7 +1266,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) if(!m_pLevelLB->GetEntryCount()) { for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++) - m_pLevelLB->InsertEntry( OUString::valueOf(static_cast<sal_Int32>(i))); + m_pLevelLB->InsertEntry( OUString::number(i)); if(pSaveNum->GetLevelCount() > 1) { OUString sEntry( "1 - " ); @@ -3018,7 +3018,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet ) if(!m_pLevelLB->GetEntryCount()) { for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++) - m_pLevelLB->InsertEntry( OUString::valueOf(static_cast<sal_Int32>(i)) ); + m_pLevelLB->InsertEntry( OUString::number(i) ); if(pSaveNum->GetLevelCount() > 1) { OUString sEntry( "1 - " ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 9f4f98d37885..896899728b9b 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -1223,7 +1223,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent ) void SvxColorTabPage::FillUserData() { // the color model is saved in the Ini-file - SetUserData( OUString::valueOf( static_cast<sal_Int32>(eCM) ) ); + SetUserData( OUString::number( eCM ) ); } //------------------------------------------------------------------------ diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index b3c13e31b8ab..f430dc92109e 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -878,7 +878,7 @@ XubString SvxTabStop::GetValueString() const XubString aStr; aStr += sal_Unicode( '(' ); - aStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nTabPos)); + aStr += OUString::number(nTabPos); aStr += cpDelim; aStr += EE_RESSTR(RID_SVXITEMS_TAB_ADJUST_BEGIN + (sal_uInt16)eAdjustment); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8fa491a8429e..17c55e2c4415 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -262,7 +262,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const if ( IsProperty( DFF_Prop_adjustValue ) || IsProperty( DFF_Prop_pVertices ) ) { pOut->WriteLine( "" ); - OString aString("ShapeId: " + OString::valueOf(static_cast<sal_Int32>(nShapeId))); + OString aString("ShapeId: " + OString::number(nShapeId)); pOut->WriteLine(aString); } for ( sal_uInt32 i = DFF_Prop_adjustValue; i <= DFF_Prop_adjust10Value; i++ ) @@ -287,13 +287,13 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const if ( nLen ) { pOut->WriteLine( "" ); - OStringBuffer aDesc("Property:" + OString::valueOf(static_cast<sal_Int32>(i)) + + OStringBuffer aDesc("Property:" + OString::number(i) + " Size:" + OString::valueOf(nLen)); pOut->WriteLine(aDesc.makeStringAndClear()); sal_Int16 nNumElem, nNumElemMem, nNumSize; rIn >> nNumElem >> nNumElemMem >> nNumSize; - aDesc.append("Entries: " + OString::valueOf(static_cast<sal_Int32>(nNumElem)) + - " Size:" + OString::valueOf(static_cast<sal_Int32>(nNumSize))); + aDesc.append("Entries: " + OString::number(nNumElem) + + " Size:" + OString::number(nNumSize)); pOut->WriteLine(aDesc.makeStringAndClear()); if ( nNumSize < 0 ) nNumSize = ( ( -nNumSize ) >> 2 ); @@ -331,7 +331,7 @@ void DffPropertyReader::ReadPropSet( SvStream& rIn, void* pClientData ) const } else { - OString aString("Property" + OString::valueOf(static_cast<sal_Int32>(i)) + + OString aString("Property" + OString::number(i) + ":" + OString::valueOf(static_cast<sal_Int32>(GetPropertyValue(i)))); pOut->WriteLine(aString); } diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index 6816b8796fff..09f25e03872b 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -112,7 +112,7 @@ const uno::Reference< container::XIndexContainer >& while( xNameCont->hasByName( sName ) ) { sName = sWW8_form; - sName += OUString::valueOf( static_cast<sal_Int32>(++n) ); + sName += OUString::number( ++n ); } const uno::Reference< lang::XMultiServiceFactory > &rServiceFactory diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 7f16621b45ec..a2bf034486f9 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -418,7 +418,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn if( nDefaultNumber ) { aInterfaceName += OUString( sal_Unicode( ' ' ) ); - aInterfaceName += OUString::valueOf( static_cast<sal_Int32>(nDefaultNumber) ); + aInterfaceName += OUString::number( nDefaultNumber ); } return aInterfaceName; @@ -922,7 +922,7 @@ void XMLFilterSettingsDialog::onSave() if( nFilters > 0 ) { aMsg = RESIDSTR(STR_FILTERS_HAVE_BEEN_SAVED); - aMsg = aMsg.replaceFirst( sPlaceholder, OUString::valueOf( static_cast<sal_Int32>(nFilters) ) ); + aMsg = aMsg.replaceFirst( sPlaceholder, OUString::number( nFilters ) ); aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() ); } else @@ -997,7 +997,7 @@ void XMLFilterSettingsDialog::onOpen() else { aMsg = RESIDSTR(STR_FILTERS_INSTALLED); - aMsg = aMsg.replaceFirst( sPlaceholder, OUString::valueOf( static_cast<sal_Int32>(nFilters) ) ); + aMsg = aMsg.replaceFirst( sPlaceholder, OUString::number( nFilters ) ); } InfoBox aBox(this, aMsg ); diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index f3f9252ebf67..e01cabb9b692 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -36,7 +36,7 @@ rtl::OString SvToken::GetTokenAsString() const aStr = aString; break; case SVTOKEN_INTEGER: - aStr = rtl::OString::valueOf(static_cast<sal_Int64>(nLong)); + aStr = OString::number(nLong); break; case SVTOKEN_STRING: aStr = aString; diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx index fc0f19d17329..f4d646569ea7 100644 --- a/idl/source/objects/basobj.cxx +++ b/idl/source/objects/basobj.cxx @@ -561,9 +561,9 @@ void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, rOutStm << "uuid(" << rtl::OUStringToOString(GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8).getStr() << ")," << endl; WriteTab( rOutStm, nTab ); rOutStm << "version(" - << rtl::OString::valueOf(static_cast<sal_Int32>(aVersion.GetMajorVersion())).getStr() + << OString::number(aVersion.GetMajorVersion()).getStr() << '.' - << rtl::OString::valueOf(static_cast<sal_Int32>(aVersion.GetMinorVersion())).getStr() + << OString::number(aVersion.GetMinorVersion()).getStr() << ")," << endl; } diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index 6f1fdf1b1315..0d7510e1046a 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -413,9 +413,9 @@ sal_Bool SvVersion::ReadSvIdl( SvTokenStream & rInStm ) sal_Bool SvVersion::WriteSvIdl( SvStream & rOutStm ) { rOutStm << SvHash_Version()->GetName().getStr() << '(' - << rtl::OString::valueOf(static_cast<sal_Int32>(nMajorVersion)).getStr() + << OString::number(nMajorVersion).getStr() << '.' - << rtl::OString::valueOf(static_cast<sal_Int32>(nMinorVersion)).getStr() + << OString::number(nMinorVersion).getStr() << ')'; return sal_True; } diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index e55712eb6423..644ff6680e39 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -1152,7 +1152,7 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount, sal_Bool bIsEnumSlot = 0 != pEnumValue; rOutStm << "// Slot Nr. " - << rtl::OString::valueOf(static_cast<sal_Int32>(nListPos)).getStr() + << OString::number(nListPos).getStr() << " : "; rtl::OString aSlotIdValue(rtl::OString::valueOf(static_cast<sal_Int32>( GetSlotId().GetValue()))); @@ -1364,7 +1364,7 @@ void SvMetaSlot::WriteSlot( const rtl::OString& rShellName, sal_uInt16 nCount, rOutStm << ',' << endl; WriteTab( rOutStm, 4 ); rOutStm - << rtl::OString::valueOf(static_cast<sal_Int32>(nCount)).getStr() + << OString::number(nCount).getStr() << "/*Offset*/, "; if( IsMethod() ) @@ -1494,7 +1494,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, { rTable[ nSId ] = this; rOutStm << "#define " << GetSlotId().getString().getStr() << '\t' - << rtl::OString::valueOf(static_cast<sal_Int32>(nSId)).getStr() + << OString::number(nSId).getStr() << endl; } @@ -1519,7 +1519,7 @@ void SvMetaSlot::WriteHelpId( SvIdlDataBase & rBase, SvStream & rOutStm, sal_Bool bIdOk = sal_False; if( rBase.FindId( aSId, &nSId2 ) ) { - aSId = rtl::OString::valueOf(static_cast<sal_Int32>(nSId2)); + aSId = OString::number(nSId2); bIdOk = sal_True; } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index 2ce42b7c4d47..e8de9dab6c20 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -1402,7 +1402,7 @@ void SvMetaType::WriteSfxItem( rtl::OStringBuffer aAttrArray; sal_uLong nAttrCount = MakeSfx( aAttrArray ); rtl::OString aAttrCount( - rtl::OString::valueOf(static_cast<sal_Int32>(nAttrCount))); + OString::number(nAttrCount)); aTypeName.append(aAttrCount); rOutStm << "extern " << aTypeName.getStr() diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 831d893f00fb..bb6e1c50081e 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -1159,7 +1159,7 @@ void Export::InsertListEntry(const rtl::OString &rText, const rtl::OString &rLin if ( nListIndex + 1 > pList->size()) { ExportListEntry *pNew = new ExportListEntry(); - (*pNew)[LIST_REFID] = rtl::OString::valueOf(static_cast<sal_Int32>(REFID_NONE)); + (*pNew)[LIST_REFID] = OString::number(REFID_NONE); pList->push_back(pNew); } ExportListEntry *pCurEntry = (*pList)[ nListIndex ]; @@ -1464,7 +1464,7 @@ sal_Bool Export::PrepareTextToMerge(rtl::OString &rText, sal_uInt16 nTyp, { pResData->sId = GetPairedListID( sLastListLine ); } - else pResData->sId = rtl::OString::valueOf(static_cast<sal_Int32>(nListIndex)); + else pResData->sId = OString::number(nListIndex); if (!pResData->sGId.isEmpty()) pResData->sGId = pResData->sGId + rtl::OString('.'); @@ -1692,7 +1692,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode ) */ sal_Bool bTranslateList = true; if( !bPairedList ){ - pResData->sId = OString::valueOf(static_cast<sal_Int32>(nMaxIndex)); + pResData->sId = OString::number(nMaxIndex); pEntrys = pMergeDataFile->GetPFormEntrys( pResData ); if ( !pEntrys ) bTranslateList = false; @@ -1815,7 +1815,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode ) } } else - pResData->sId = rtl::OString::valueOf(static_cast<sal_Int32>(nIdx)); + pResData->sId = OString::number(nIdx); PFormEntrys *oldEntry = pEntrys; pEntrys = pMergeDataFile->GetPFormEntrys( pResData ); if( !pEntrys ) diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index f23263b62962..a3cdcf62ed35 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -222,27 +222,27 @@ void StringHelper::appendString( OUStringBuffer& rStr, const OUString& rData, sa void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt8 nData, sal_Int32 nWidth, sal_Unicode cFill ) { - appendString( rStr, OUString::valueOf( static_cast< sal_Int32 >( nData ) ), nWidth, cFill ); + appendString( rStr, OUString::number( nData ), nWidth, cFill ); } void StringHelper::appendDec( OUStringBuffer& rStr, sal_Int8 nData, sal_Int32 nWidth, sal_Unicode cFill ) { - appendString( rStr, OUString::valueOf( static_cast< sal_Int32 >( nData ) ), nWidth, cFill ); + appendString( rStr, OUString::number( nData ), nWidth, cFill ); } void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt16 nData, sal_Int32 nWidth, sal_Unicode cFill ) { - appendString( rStr, OUString::valueOf( static_cast< sal_Int32 >( nData ) ), nWidth, cFill ); + appendString( rStr, OUString::number( nData ), nWidth, cFill ); } void StringHelper::appendDec( OUStringBuffer& rStr, sal_Int16 nData, sal_Int32 nWidth, sal_Unicode cFill ) { - appendString( rStr, OUString::valueOf( static_cast< sal_Int32 >( nData ) ), nWidth, cFill ); + appendString( rStr, OUString::number( nData ), nWidth, cFill ); } void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt32 nData, sal_Int32 nWidth, sal_Unicode cFill ) { - appendString( rStr, OUString::valueOf( static_cast< sal_Int64 >( nData ) ), nWidth, cFill ); + appendString( rStr, OUString::number( nData ), nWidth, cFill ); } void StringHelper::appendDec( OUStringBuffer& rStr, sal_Int32 nData, sal_Int32 nWidth, sal_Unicode cFill ) diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 407180c8ec53..a69b607d4616 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -262,7 +262,7 @@ static void impl_AddInt( sax_fastparser::FastAttributeList *pAttrList, sal_Int32 if ( !pAttrList ) return; - pAttrList->add( nElement, OString::valueOf( static_cast< sal_Int32 >( nValue ) ).getStr() ); + pAttrList->add( nElement, OString::number( nValue ).getStr() ); } inline sal_uInt16 impl_GetUInt16( const sal_uInt8* &pVal ) diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 6be9800faf94..8e67c6d51903 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -635,7 +635,7 @@ const Reference< XIndexContainer >& while( xNameCont->hasByName( sName ) ) { sName = sStdName; - sName += OUString::valueOf(static_cast<sal_Int32>(++n)); + sName += OUString::number(++n); } const Reference< XMultiServiceFactory > &rServiceFactory diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 51dff9d179a7..6cd65d95d73d 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -517,9 +517,9 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper const char hundredthmmC[] = "0\xe2\x80\x89\xC2\xB5""m"; // in UTF-8: 0, thin space, µ (micro), m (meter) const rtl::OUString hundredthmm(hundredthmmC, sizeof(hundredthmmC)-1, RTL_TEXTENCODING_UTF8); if ( aSize.Width < MIN_WIDTH && m_nOrientation == 1 ) - throw beans::PropertyVetoException("Too small width for FixedLine; minimum is " + rtl::OUString::valueOf(static_cast<sal_Int32>(MIN_WIDTH)) + hundredthmm, static_cast<cppu::OWeakObject*>(this)); + throw beans::PropertyVetoException("Too small width for FixedLine; minimum is " + OUString::number(MIN_WIDTH) + hundredthmm, static_cast<cppu::OWeakObject*>(this)); else if ( aSize.Height < MIN_HEIGHT && m_nOrientation == 0 ) - throw beans::PropertyVetoException("Too small height for FixedLine; minimum is " + rtl::OUString::valueOf(static_cast<sal_Int32>(MIN_HEIGHT)) + hundredthmm, static_cast<cppu::OWeakObject*>(this)); + throw beans::PropertyVetoException("Too small height for FixedLine; minimum is " + OUString::number(MIN_HEIGHT) + hundredthmm, static_cast<cppu::OWeakObject*>(this)); OShapeHelper::setSize(aSize,this); } // ----------------------------------------------------------------------------- diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx index e08cefa3c3f1..691f02c7bc19 100644 --- a/rsc/source/parser/erscerr.cxx +++ b/rsc/source/parser/erscerr.cxx @@ -112,7 +112,7 @@ void RscError::WriteError( const ERRTYPE& rError, const char * pMessage ) case ERR_ERROR: { StdLstErr( "!! " ); if( 1 == nErrors ) - StdLstErr(rtl::OString::valueOf(static_cast<sal_Int32>(nErrors )).getStr()); + StdLstErr(OString::number(nErrors).getStr()); else StdLstErr(rtl::OString::valueOf(static_cast<sal_Int32>(nErrors -1)).getStr()); StdLstErr( " Error" ); diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 1b2888c0b982..9cdb2a75e2f6 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -786,7 +786,7 @@ rtl::OUString ScDPDimensionSaveData::CreateGroupDimName( { rtl::OUString aDimName( rSourceName ); if ( !bUseSource ) - aDimName += rtl::OUString::valueOf(static_cast<sal_Int32>(nAdd)); + aDimName += OUString::number(nAdd); bool bExists = false; // look for existing group dimensions diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index eb200db3626c..fc096a8c6fa3 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -2798,7 +2798,7 @@ void ScDPResultDimension::LateInitFrom( { if ( rParams.IsEnd( nPos ) ) return; - OSL_ENSURE( nPos <= pItemData.size(), rtl::OString::valueOf(static_cast<sal_Int32>(pItemData.size())).getStr() ); + OSL_ENSURE( nPos <= pItemData.size(), OString::number(pItemData.size()).getStr() ); ScDPDimension* pThisDim = rParams.GetDim( nPos ); ScDPLevel* pThisLevel = rParams.GetLevel( nPos ); SCROW rThisData = pItemData[nPos]; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 0ef12c742ded..74294675fef2 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2395,7 +2395,7 @@ void getFormatString(SvNumberFormatter* pFormatter, sal_uLong nFormat, String& r } } if( bAppendPrec ) - rFmtStr += rtl::OUString::valueOf(static_cast<sal_Int32>(nPrec)); + rFmtStr += OUString::number(nPrec); const SvNumberformat* pFormat = pFormatter->GetEntry( nFormat ); if( lcl_FormatHasNegColor( pFormat ) ) rFmtStr += '-'; diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 3ac521235ff5..51eb967bcaa9 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -572,7 +572,7 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm ) aEntry.eConnect = SC_AND; rItem.meType = ScQueryEntry::ByString; - rItem.maString = rtl::OUString::valueOf(static_cast<sal_Int32>(nCntOfTop10)); + rItem.maString = OUString::number(nCntOfTop10); rStrm.Ignore(20); return; @@ -640,7 +640,7 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm ) case EXC_AFTYPE_BOOLERR: rStrm >> nBoolErr >> nVal; rStrm.Ignore( 6 ); - rItem.maString = rtl::OUString::valueOf(static_cast<sal_Int32>(nVal)); + rItem.maString = OUString::number(nVal); bIgnore = (nBoolErr != 0); break; case EXC_AFTYPE_EMPTY: diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 0120a38d4ae8..f416f58fd9a1 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -1233,7 +1233,7 @@ rtl::OString createHexStringFromDigit(sal_uInt8 nDigit) { rtl::OString aString = rtl::OString::valueOf( static_cast<sal_Int32>(nDigit), 16 ); if(aString.getLength() == 1) - aString = aString + rtl::OString::valueOf(static_cast<sal_Int32>(0)); + aString = aString + OString::number(0); return aString; } diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index 53ab66ba2ec5..d4109e64636f 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -140,8 +140,8 @@ void XclExpExtDataBar::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElementNS( XML_x14, XML_dataBar, - XML_minLength, rtl::OString::valueOf(static_cast<sal_Int32>(0)).getStr(), - XML_maxLength, rtl::OString::valueOf(static_cast<sal_Int32>(100)).getStr(), + XML_minLength, OString::number(0).getStr(), + XML_maxLength, OString::number(100).getStr(), XML_axisPosition, getAxisPosition(meAxisPosition), FSEND ); diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 809786747363..a7b8b032160c 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1213,7 +1213,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->singleElement( XML_numFmt, - XML_numFmtId, OString::valueOf( static_cast<sal_Int32>(mnXclNumFmt) ).getStr(), + XML_numFmtId, OString::number( mnXclNumFmt ).getStr(), XML_formatCode, rtl::OUStringToOString(maNumFmtString, RTL_TEXTENCODING_UTF8).getStr(), FSEND ); } @@ -2988,7 +2988,7 @@ void XclExpDxfs::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->startElement( XML_dxfs, - XML_count, rtl::OString::valueOf( static_cast<sal_Int32>(maDxf.size())).getStr(), + XML_count, OString::number(maDxf.size()).getStr(), FSEND ); for ( DxfContainer::iterator itr = maDxf.begin(); itr != maDxf.end(); ++itr ) diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 6eecf7eda716..84a6042afaa1 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -79,7 +79,7 @@ void XclPCItem::SetDateTime( const DateTime& rDateTime ) void XclPCItem::SetInteger( sal_Int16 nValue ) { meType = EXC_PCITEM_INTEGER; - maText = rtl::OUString::valueOf(static_cast<sal_Int32>(nValue)); + maText = OUString::number(nValue); mnValue = nValue; } diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 14d8cb23238b..4834122038f8 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -484,7 +484,7 @@ OUString XclTools::GetXclBuiltInDefName( sal_Unicode cBuiltIn ) if( cBuiltIn < SAL_N_ELEMENTS( ppcDefNames ) ) return rtl::OUString::createFromAscii(ppcDefNames[cBuiltIn]); else - return rtl::OUString::valueOf(static_cast<sal_Int32>(cBuiltIn)); + return OUString::number(cBuiltIn); } OUString XclTools::GetBuiltInDefName( sal_Unicode cBuiltIn ) diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index de2888e27cb7..6b93348afaf7 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -424,7 +424,7 @@ void ScHTMLExport::WriteOverview() { pDoc->GetName( nTab, aStr ); rStrm << "<A HREF=\"#table" - << rtl::OString::valueOf(static_cast<sal_Int32>(nTab)).getStr() + << OString::number(nTab).getStr() << "\">"; OUT_STR( aStr ); rStrm << "</A>"; @@ -686,7 +686,7 @@ void ScHTMLExport::WriteTables() // Anker festlegen: rStrm << "<A NAME=\"table" - << rtl::OString::valueOf(static_cast<sal_Int32>(nTab)).getStr() + << OString::number(nTab).getStr() << "\">"; TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 ); OUT_STR( aStrOut ); diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 3c943a505ecd..a26137dad4e6 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1832,7 +1832,7 @@ sal_Int32 lclCreatePredefinedFormat( const Reference< XNumberFormats >& rxNumFmt catch( Exception& ) { OSL_FAIL( OStringBuffer( "lclCreatePredefinedFormat - cannot create predefined number format " ). - append( OString::valueOf( static_cast< sal_Int32 >( nPredefId ) ) ).getStr() ); + append( OString::number( nPredefId ) ).getStr() ); } return nIndex; } diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 59948507a7b2..a8d1a5fb16fc 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -1018,7 +1018,7 @@ sal_uLong Sc10Import::Import() #if OSL_DEBUG_LEVEL > 0 if (nError) { - OSL_FAIL( rtl::OString::valueOf(static_cast<sal_Int32>(nError)).getStr()); + OSL_FAIL( OString::number(nError).getStr()); } #endif diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index de931b033a6a..a0b53b86ccb2 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -919,7 +919,7 @@ void ScXMLExport::WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_In AddAttribute(XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_COLLAPSE); if (nRepeatColumns > 1) { - OUString sOUEndCol(OUString::valueOf(static_cast <sal_Int32> (nRepeatColumns))); + OUString sOUEndCol(OUString::number(nRepeatColumns)); AddAttribute(sAttrColumnsRepeated, sOUEndCol); } if (nIndex != -1) @@ -4161,7 +4161,7 @@ void ScXMLExport::WriteExternalRefCaches() { if (nMaxColsUsed > 1) AddAttribute(XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, - OUString::valueOf(static_cast<sal_Int32>(nMaxColsUsed))); + OUString::number(nMaxColsUsed)); SvXMLElementExport aElemColumn(*this, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true); } diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 581954c50db4..353b50ba29b1 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -271,9 +271,9 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl ) if(!maEdMin.GetText().Len()) { if(nSelectMin == COLORSCALE_PERCENTILE || nSelectMin == COLORSCALE_PERCENT) - maEdMin.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(50))); + maEdMin.SetText(OUString::number(50)); else - maEdMin.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(0))); + maEdMin.SetText(OUString::number(0)); } } @@ -286,9 +286,9 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl ) if(!maEdMax.GetText().Len()) { if(nSelectMax == COLORSCALE_PERCENTILE || nSelectMax == COLORSCALE_PERCENT) - maEdMax.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(50))); + maEdMax.SetText(OUString::number(50)); else - maEdMax.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(0))); + maEdMax.SetText(OUString::number(0)); } } return 0; diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 20e3f813324d..adb0f27e74a8 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -835,7 +835,7 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDo maLbEntryTypeMin.SelectEntryPos(0); maLbEntryTypeMiddle.SelectEntryPos(2); maLbEntryTypeMax.SelectEntryPos(1); - maEdMiddle.SetText(rtl::OUString::valueOf(static_cast<sal_Int32>(50))); + maEdMiddle.SetText(OUString::number(50)); } FreeResource(); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 3e1b1e197128..3758a19fca43 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1129,7 +1129,7 @@ String SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const aPageNumValue += sal_Unicode(' '); break; default: - aPageNumValue += rtl::OUString::valueOf(static_cast<sal_Int32>(nNum)); + aPageNumValue += OUString::number(nNum); } return(aPageNumValue); diff --git a/sd/source/filter/eppt/pptexsoundcollection.cxx b/sd/source/filter/eppt/pptexsoundcollection.cxx index 9502fa2a6ce0..3519ed516d1d 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.cxx +++ b/sd/source/filter/eppt/pptexsoundcollection.cxx @@ -78,7 +78,7 @@ sal_uInt32 ExSoundEntry::GetSize( sal_uInt32 nId ) const if ( !aExtension.isEmpty() ) // String Atom ( instance 1 - extension of sound ) nSize += aExtension.getLength() * 2 + 8; - rtl::OUString aId( rtl::OUString::valueOf(static_cast<sal_Int32>(nId)) ); // String Atom ( instance 2 - reference id ) + rtl::OUString aId( OUString::number(nId) ); // String Atom ( instance 2 - reference id ) nSize += 2 * aId.getLength() + 8; nSize += nFileSize + 8; // SoundData Atom @@ -116,7 +116,7 @@ void ExSoundEntry::Write( SvStream& rSt, sal_uInt32 nId ) const rSt << aExtension[i]; } // id of sound ( instance 2 ) - rtl::OUString aId( rtl::OUString::valueOf(static_cast<sal_Int32>(nId) ) ); + rtl::OUString aId( OUString::number(nId ) ); sal_Int32 nIdLen = aId.getLength(); rSt << (sal_uInt32)( ( EPP_CString << 16 ) | 32 ) << (sal_uInt32)( nIdLen * 2 ); for ( i = 0; i < nIdLen; ++i ) diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 8fa0545e430f..ac3f1a564319 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -1875,7 +1875,7 @@ String ImplSdPPTImport::ReadSound(sal_uInt32 nSoundRef) const } if ( bRefStrValid ) { - if ( rtl::OUString::valueOf(static_cast<sal_Int32>(nSoundRef)) == aRefStr ) + if ( OUString::number(nSoundRef) == aRefStr ) { rStCtrl.Seek( nPosMerk2 ); if ( SeekToRec( rStCtrl, PPT_PST_CString, nStrLen, NULL, 0 ) ) diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 64d30dde7266..08bc6eae3122 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -648,7 +648,7 @@ Window * lcl_GetTopmostParent( Window * pWindow ) void CustomAnimationCreateDialog::setPosition() { SvtViewOptions aDlgOpt( - E_TABDIALOG, rtl::OUString::valueOf(static_cast<sal_Int32>(DLG_CUSTOMANIMATION_CREATE))); + E_TABDIALOG, OUString::number(DLG_CUSTOMANIMATION_CREATE)); if ( aDlgOpt.Exists() ) { SetWindowState( rtl::OUStringToOString(aDlgOpt.GetWindowState(), @@ -676,7 +676,7 @@ void CustomAnimationCreateDialog::storePosition() { // save settings (screen position and current page) SvtViewOptions aDlgOpt( - E_TABDIALOG, rtl::OUString::valueOf(static_cast<sal_Int32>(DLG_CUSTOMANIMATION_CREATE))); + E_TABDIALOG, OUString::number(DLG_CUSTOMANIMATION_CREATE)); aDlgOpt.SetWindowState(OStringToOUString( GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US)); } diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 7fc0c58e55a9..5edfc96452ab 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -124,22 +124,22 @@ CopyDlg::~CopyDlg() { String& rStr = GetExtraData(); - rStr = OUString::valueOf(static_cast<sal_Int64>(maNumFldCopies.GetValue())); + rStr = OUString::number(maNumFldCopies.GetValue()); rStr.Append( TOKEN ); - rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveX.GetValue())); + rStr += OUString::number(maMtrFldMoveX.GetValue()); rStr.Append( TOKEN ); - rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldMoveY.GetValue())); + rStr += OUString::number(maMtrFldMoveY.GetValue()); rStr.Append( TOKEN ); - rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldAngle.GetValue())); + rStr += OUString::number(maMtrFldAngle.GetValue()); rStr.Append( TOKEN ); - rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldWidth.GetValue())); + rStr += OUString::number(maMtrFldWidth.GetValue()); rStr.Append( TOKEN ); - rStr += OUString::valueOf(static_cast<sal_Int64>(maMtrFldHeight.GetValue())); + rStr += OUString::number(maMtrFldHeight.GetValue()); rStr.Append( TOKEN ); rStr += OUString::valueOf( (long)maLbStartColor.GetSelectEntryColor().GetColor() ); diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 5ce8eb525898..899b75e6d261 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -138,7 +138,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) String aStr(SdResId( STR_LAYOUT_OUTLINE )); aStyleName.Append( aStr ); aStyleName.Append( sal_Unicode(' ') ); - aStyleName.Append( OUString::valueOf( static_cast<sal_Int32>( nDepth ) ) ); + aStyleName.Append( OUString::number( nDepth ) ); } SfxStyleSheetBasePool* pStyleSheetPool = mpDocSh->GetStyleSheetPool(); diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index e0ba19b8f708..3057e91808bc 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -299,7 +299,7 @@ void ConfigurationAccess::SaveConfiguration() for( k = 1; k < maSettings.size(); k++ ) { OptimizerSettings& rSettings( maSettings[ k ] ); - OUString aElementName( TKGet( TK_Template ).concat( OUString::valueOf( static_cast< sal_Int32 >( k ) ) ) ); + OUString aElementName( TKGet( TK_Template ).concat( OUString::number( k ) ) ); Reference< lang::XSingleServiceFactory > xChildFactory ( xSet, UNO_QUERY_THROW ); Reference< container::XNameReplace > xChild( xChildFactory->createInstance(), UNO_QUERY_THROW ); xNameContainer->insertByName( aElementName, Any( xChild ) ); diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 4783625c5cc6..2b2a7110c008 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -278,7 +278,7 @@ css::registry::RegistryKeyType Key::getKeyType(rtl::OUString const & rKeyName) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyType:" " underlying RegistryKey::getKeyType() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } switch (type) { @@ -311,7 +311,7 @@ css::registry::RegistryValueType Key::getValueType() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getValueType:" " underlying RegistryKey::getValueInfo() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } switch (type) { @@ -360,7 +360,7 @@ sal_Int32 Key::getLongValue() throw ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongValue:" " underlying RegistryKey::getValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } return value; @@ -378,7 +378,7 @@ void Key::setLongValue(sal_Int32 value) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setLongValue:" " underlying RegistryKey::setValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -409,7 +409,7 @@ css::uno::Sequence< sal_Int32 > Key::getLongListValue() throw ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLongListValue:" " underlying RegistryKey::getLongListValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } sal_uInt32 n = list.getLength(); @@ -445,7 +445,7 @@ void Key::setLongListValue(css::uno::Sequence< sal_Int32 > const & seqValue) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setLongListValue:" " underlying RegistryKey::setLongListValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -464,7 +464,7 @@ rtl::OUString Key::getAsciiValue() throw ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey::getValueInfo() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_STRING) { @@ -473,7 +473,7 @@ rtl::OUString Key::getAsciiValue() throw ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey type = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(type))), + OUString::number(type)), static_cast< OWeakObject * >(this)); } // size contains terminating null (error in underlying registry.cxx): @@ -502,7 +502,7 @@ rtl::OUString Key::getAsciiValue() throw ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getAsciiValue:" " underlying RegistryKey::getValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (list[size - 1] != '\0') { @@ -559,7 +559,7 @@ void Key::setAsciiValue(rtl::OUString const & value) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setAsciiValue:" " underlying RegistryKey::setValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -591,7 +591,7 @@ css::uno::Sequence< rtl::OUString > Key::getAsciiListValue() throw ( "com.sun.star.registry.SimpleRegistry key" " getAsciiListValue: underlying" " RegistryKey::getStringListValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } sal_uInt32 n = list.getLength(); @@ -665,7 +665,7 @@ void Key::setAsciiListValue( "com.sun.star.registry.SimpleRegistry key" " setAsciiListValue: underlying" " RegistryKey::setStringListValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -684,7 +684,7 @@ rtl::OUString Key::getStringValue() throw ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey::getValueInfo() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_UNICODE) { @@ -693,7 +693,7 @@ rtl::OUString Key::getStringValue() throw ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey type = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(type))), + OUString::number(type)), static_cast< OWeakObject * >(this)); } // size contains terminating null and is *2 (error in underlying @@ -723,7 +723,7 @@ rtl::OUString Key::getStringValue() throw ( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getStringValue:" " underlying RegistryKey::getValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (list[size/2 - 1] != 0) { @@ -753,7 +753,7 @@ void Key::setStringValue(rtl::OUString const & value) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setStringValue:" " underlying RegistryKey::setValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -785,7 +785,7 @@ css::uno::Sequence< rtl::OUString > Key::getStringListValue() throw ( "com.sun.star.registry.SimpleRegistry key" " getStringListValue: underlying" " RegistryKey::getUnicodeListValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } sal_uInt32 n = list.getLength(); @@ -824,7 +824,7 @@ void Key::setStringListValue( "com.sun.star.registry.SimpleRegistry key" " setStringListValue: underlying" " RegistryKey::setUnicodeListValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -844,7 +844,7 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" " underlying RegistryKey::getValueInfo() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } if (type != RG_VALUETYPE_BINARY) { @@ -853,7 +853,7 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" " underlying RegistryKey type = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(type))), + OUString::number(type)), static_cast< OWeakObject * >(this)); } if (size > SAL_MAX_INT32) { @@ -872,7 +872,7 @@ css::uno::Sequence< sal_Int8 > Key::getBinaryValue() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getBinaryValue:" " underlying RegistryKey::getValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } return value; @@ -892,7 +892,7 @@ void Key::setBinaryValue(css::uno::Sequence< sal_Int8 > const & value) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key setBinaryValue:" " underlying RegistryKey::setValue() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -915,7 +915,7 @@ css::uno::Reference< css::registry::XRegistryKey > Key::openKey( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key openKey:" " underlying RegistryKey::openKey() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -938,7 +938,7 @@ css::uno::Reference< css::registry::XRegistryKey > Key::createKey( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key createKey:" " underlying RegistryKey::createKey() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -954,7 +954,7 @@ void Key::closeKey() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key closeKey:" " underlying RegistryKey::closeKey() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -970,7 +970,7 @@ void Key::deleteKey(rtl::OUString const & rKeyName) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key deleteKey:" " underlying RegistryKey::deleteKey() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -988,7 +988,7 @@ Key::openKeys() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key openKeys:" " underlying RegistryKey::openSubKeys() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } sal_uInt32 n = list.getLength(); @@ -1021,7 +1021,7 @@ css::uno::Sequence< rtl::OUString > Key::getKeyNames() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getKeyNames:" " underlying RegistryKey::getKeyNames() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } sal_uInt32 n = list.getLength(); @@ -1056,7 +1056,7 @@ sal_Bool Key::createLink( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key createLink:" " underlying RegistryKey::createLink() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); default: return false; @@ -1074,7 +1074,7 @@ void Key::deleteLink(rtl::OUString const & rLinkName) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key deleteLink:" " underlying RegistryKey::deleteLink() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -1091,7 +1091,7 @@ rtl::OUString Key::getLinkTarget(rtl::OUString const & rLinkName) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getLinkTarget:" " underlying RegistryKey::getLinkTarget() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } return target; @@ -1109,7 +1109,7 @@ rtl::OUString Key::getResolvedName(rtl::OUString const & aKeyName) RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry key getResolvedName:" " underlying RegistryKey::getResolvedName() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } return resolved; @@ -1140,7 +1140,7 @@ void SimpleRegistry::open( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "): underlying Registry::open/create() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -1161,7 +1161,7 @@ void SimpleRegistry::close() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.close:" " underlying Registry::close() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -1177,7 +1177,7 @@ void SimpleRegistry::destroy() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.destroy:" " underlying Registry::destroy() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } @@ -1194,7 +1194,7 @@ css::uno::Reference< css::registry::XRegistryKey > SimpleRegistry::getRootKey() RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.getRootKey:" " underlying Registry::getRootKey() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } return new Key(this, root); @@ -1236,7 +1236,7 @@ void SimpleRegistry::mergeKey( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.SimpleRegistry.mergeKey:" " underlying Registry::getRootKey/mergeKey() = ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(err))), + OUString::number(err)), static_cast< OWeakObject * >(this)); } } diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index ef1372082d1c..a079d99d301e 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -238,7 +238,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue ) DBG_CHKTHIS(SfxAllEnumItem, 0); SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl; pVal->nValue = nValue; - pVal->aText = rtl::OUString::valueOf(static_cast<sal_Int32>(nValue)); + pVal->aText = OUString::number(nValue); if ( !pValues ) pValues = new SfxAllEnumValueArr; diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index ad016dcd9309..e9d04f838fe0 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -463,7 +463,7 @@ SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation, const { DBG_CHKTHIS(CntUInt32Item, 0); - rText = rtl::OUString::valueOf(static_cast<sal_Int64>(m_nValue)); + rText = OUString::number(m_nValue); return SFX_ITEM_PRESENTATION_NAMELESS; } diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index d63ef94a3a15..0afc9e18f2d5 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -94,7 +94,7 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation, const IntlWrapper *) const { DBG_CHKTHIS(SfxInt16Item, 0); - rText = rtl::OUString::valueOf(static_cast<sal_Int32>(m_nValue)); + rText = OUString::number(m_nValue); return SFX_ITEM_PRESENTATION_NAMELESS; } diff --git a/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx index e1720690624d..5db363d97471 100644 --- a/svl/source/items/rngitem_inc.cxx +++ b/svl/source/items/rngitem_inc.cxx @@ -71,9 +71,7 @@ SfxItemPresentation SfxXRangeItem::GetPresentation const IntlWrapper * ) const { - rText = rtl::OUString::valueOf(static_cast<sal_Int64>(nFrom)); - rText += ':'; - rText += rtl::OUString::valueOf(static_cast<sal_Int64>(nTo)); + rText = OUString::number(nFrom) + ":" + OUString::number(nTo); return SFX_ITEM_PRESENTATION_NAMELESS; } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 9fa22a8936f3..2f2543c9ef30 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -726,12 +726,12 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt ) sal_uLong nPos = GetThumbPos(); if ( nPos != _nLastPos ) { - String aTip( rtl::OUString::valueOf(static_cast<sal_Int32>(nPos)) ); + String aTip( OUString::number(nPos) ); aTip += '/'; if ( _pDataWin->GetRealRowCount().Len() ) aTip += _pDataWin->GetRealRowCount(); else - aTip += rtl::OUString::valueOf(static_cast<sal_Int32>(GetRangeMax())); + aTip += OUString::number(GetRangeMax()); Rectangle aRect( GetPointerPosPixel(), Size( GetTextHeight(), GetTextWidth( aTip ) ) ); if ( _nTip ) diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 6ddec6892bef..83955ae72505 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -894,7 +894,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) String aMonthText( maCalendarWrapper.getDisplayName( i18n::CalendarDisplayIndex::MONTH, nMonth-1, 1)); aMonthText += ' '; - aMonthText += rtl::OUString::valueOf(static_cast<sal_Int64>(nYear)); + aMonthText += OUString::number(nYear); long nMonthTextWidth = GetTextWidth( aMonthText ); long nMonthOffX1 = 0; long nMonthOffX2 = 0; @@ -912,7 +912,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) aMonthText = maCalendarWrapper.getDisplayName( i18n::CalendarDisplayIndex::MONTH, nMonth-1, 0); aMonthText += ' '; - aMonthText += rtl::OUString::valueOf(static_cast<sal_Int64>(nYear)); + aMonthText += OUString::number(nYear); nMonthTextWidth = GetTextWidth( aMonthText ); } long nTempOff = (mnMonthWidth-nMonthTextWidth+1)/2; diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index b99b90381a09..99a8697472b4 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -497,7 +497,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) nMaxWidth /= nTickUnit; else nMaxWidth /= aImplRulerUnitTab[mnUnitIndex].nTickUnit; - OUString aNumStr = OUString::valueOf(static_cast<sal_Int32>(nMaxWidth)); + OUString aNumStr = OUString::number(nMaxWidth); long nTxtWidth = GetTextWidth( aNumStr ); const long nTextOff = 4; if ( nTickWidth < nTxtWidth+nTextOff ) diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 81a679da5c02..6e6cda2144ef 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -186,7 +186,7 @@ static ::rtl::OUString ImplGetParameterString( const TransferableObjectDescripto } aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";viewaspect=\"" )); - aParams += ::rtl::OUString::valueOf( static_cast< sal_Int32 >( rObjDesc.mnViewAspect ) ); + aParams += OUString::number( rObjDesc.mnViewAspect ); aParams += aChar; aParams += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ";width=\"" )); diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 9a05f8b9fed3..bed76045a415 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -229,7 +229,7 @@ namespace svt { namespace uno DBG_UNHANDLED_EXCEPTION(); } // fallback for ill-behaved clients: the numeric state - return rtl::OUString::valueOf(static_cast<sal_Int32>(i_nState)); + return OUString::number(i_nState); } //------------------------------------------------------------------------------------------------------------------ diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 74a543554cb1..c58cfac3dd9a 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -123,7 +123,7 @@ void CompressGraphicsDialog::Update() aViewSizeString += String( " x " ) ; aViewSizeString += GetUnitString( m_aViewSize100mm.Height(), eFieldUnit, cSeparator ); aViewSizeString += ( " at " ) ; - aViewSizeString += OUString::valueOf( static_cast< sal_Int32 >(aValX)); + aViewSizeString += OUString::number( aValX); aViewSizeString += ( " DPI" ) ; m_pFixedText3->SetText(aViewSizeString); @@ -144,13 +144,13 @@ void CompressGraphicsDialog::Update() void CompressGraphicsDialog::UpdateNewWidthMF() { int nPixelX = (sal_Int32)( GetViewWidthInch() * m_dResolution ); - m_pMFNewWidth->SetText( OUString::valueOf( static_cast< sal_Int32 >( nPixelX ) )); + m_pMFNewWidth->SetText( OUString::number( nPixelX )); } void CompressGraphicsDialog::UpdateNewHeightMF() { int nPixelY = (sal_Int32)( GetViewHeightInch() * m_dResolution ); - m_pMFNewHeight->SetText( OUString::valueOf( static_cast< sal_Int32 >( nPixelY ) )); + m_pMFNewHeight->SetText( OUString::number( nPixelY )); } void CompressGraphicsDialog::UpdateResolutionLB() diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index fa47a5fead6f..511368981623 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -815,8 +815,7 @@ SfxItemPresentation SdrPercentItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText = OUString::valueOf( static_cast< sal_Int32 >(GetValue())); - rText += sal_Unicode('%'); + rText = OUString::number(GetValue()) + "%"; if(ePres == SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1299,9 +1298,7 @@ SfxItemPresentation SdrTextAniDelayItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText = OUString::valueOf( static_cast< sal_Int32 >( GetValue())); - rText += sal_Unicode('m'); - rText += sal_Unicode('s'); + rText = OUString::number(GetValue()) + "ms"; if(ePres == SFX_ITEM_PRESENTATION_COMPLETE) { @@ -1486,7 +1483,7 @@ SfxItemPresentation SdrCustomShapeAdjustmentItem::GetPresentation( SfxMapUnit /*ePresentationMetric*/, XubString &rText, const IntlWrapper *) const { sal_uInt32 i, nCount = GetCount(); - rText.Append( OUString::valueOf( static_cast<sal_Int32>( nCount ) ) ); + rText.Append( OUString::number( nCount ) ); for ( i = 0; i < nCount; i++ ) { rText += sal_Unicode( ' ' ); @@ -2055,8 +2052,7 @@ SfxItemPresentation SdrSignedPercentItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText = OUString::valueOf( static_cast< sal_Int32 >( GetValue())); - rText += sal_Unicode('%'); + rText = OUString::number(GetValue()) + "%"; if(ePres == SFX_ITEM_PRESENTATION_COMPLETE) { diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 0fe31f9e7abf..2827c4f47f22 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -594,7 +594,7 @@ const XubString& SdrMarkList::GetMarkDescription() const } aNam.Insert(sal_Unicode(' '), 0); - aNam.Insert(OUString::valueOf( static_cast<sal_Int32>(nAnz) ), 0); + aNam.Insert(OUString::number( nAnz ), 0); } ((SdrMarkList*)(this))->maMarkName = aNam; @@ -694,7 +694,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const } aNam.Insert(sal_Unicode(' '), 0); - aNam.Insert(OUString::valueOf( static_cast<sal_Int32>(nMarkPtObjAnz) ), 0); + aNam.Insert(OUString::number( nMarkPtObjAnz ), 0); } XubString aStr1; @@ -706,7 +706,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const else { aStr1 = (ImpGetResStr(bGlue ? STR_ViewMarkedGluePoints : STR_ViewMarkedPoints)); - aStr1.SearchAndReplaceAscii("%2", OUString::valueOf( static_cast<sal_Int32>(nMarkPtAnz) )); + aStr1.SearchAndReplaceAscii("%2", OUString::number( nMarkPtAnz )); } aStr1.SearchAndReplaceAscii("%1", aNam); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index d9b2d08ca660..a7fb71a25b9f 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1954,7 +1954,7 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, if(nPos != STRING_NOTFOUND) { rStr.Erase(nPos, 2); - rStr.Insert(OUString::valueOf( static_cast<sal_Int32>(nVal) ), nPos); + rStr.Insert(OUString::number( nVal ), nPos); } } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 35b89c0b9b16..e35c9940fc0b 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1096,7 +1096,7 @@ void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rSt if (nPos >= 0) // Replace '%2' with the passed value. rStr = rStr.replaceAt( - nPos, 2, rtl::OUString::valueOf(static_cast<sal_Int32>(nVal))); + nPos, 2, OUString::number(nVal)); } void SdrObject::ImpForcePlusData() diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 96e8abef86f2..17bd80d010e0 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1946,7 +1946,7 @@ void SdrPathObj::TakeObjNameSingul(XubString& rName) const if(STRING_NOTFOUND != nPos) { rName.Erase(nPos, 2); - rName.Insert(rtl::OUString::valueOf(static_cast<sal_Int32>(nPointCount)), nPos); + rName.Insert(OUString::number(nPointCount), nPos); } } } diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index dc7e3c1447bc..64e2ed82c8b6 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -99,7 +99,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ); rText.AppendAscii(": "); case SFX_ITEM_PRESENTATION_NAMELESS: - rText += OUString::valueOf(static_cast<sal_Int32>(GetValue())); + rText += OUString::number(GetValue()); rText += sal_Unicode('%'); return ePres; default: @@ -495,7 +495,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ); rText.AppendAscii(": "); case SFX_ITEM_PRESENTATION_NAMELESS: - rText += OUString::valueOf(static_cast<sal_Int32>(GetValue())); + rText += OUString::number(GetValue()); rText += sal_Unicode('%'); return ePres; default: @@ -622,7 +622,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation // rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) ); // rText += ": "; case SFX_ITEM_PRESENTATION_NAMELESS: - rText += OUString::valueOf(static_cast<sal_Int32>(GetValue())); + rText += OUString::number(GetValue()); return ePres; default: return SFX_ITEM_PRESENTATION_NONE; diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index de0d3a841611..59fe3a53e137 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -237,7 +237,7 @@ SwField* SwPageNumberField::Copy() const rtl::OUString SwPageNumberField::GetPar2() const { - return rtl::OUString::valueOf(static_cast<sal_Int32>(nOffset)); + return OUString::number(nOffset); } void SwPageNumberField::SetPar2(const rtl::OUString& rStr) @@ -2126,7 +2126,7 @@ SwField* SwRefPageSetField::Copy() const rtl::OUString SwRefPageSetField::GetPar2() const { - return rtl::OUString::valueOf(static_cast<sal_Int32>(GetOffset())); + return OUString::number(GetOffset()); } void SwRefPageSetField::SetPar2(const rtl::OUString& rStr) diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx index 4e55297555fd..3d841e4be409 100644 --- a/sw/source/core/fields/flddat.cxx +++ b/sw/source/core/fields/flddat.cxx @@ -114,7 +114,7 @@ void SwDateTimeField::SetPar2(const rtl::OUString& rStr) rtl::OUString SwDateTimeField::GetPar2() const { if (nOffset) - return rtl::OUString::valueOf(static_cast<sal_Int32>(nOffset)); + return OUString::number(nOffset); return rtl::OUString(); } diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 1da14bdcde8b..be7ee34047a5 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -501,7 +501,7 @@ static sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo, } if( rInfo.nFtnOffset > 0 ) { - pParts[1] = rtl::OUString::valueOf(static_cast<sal_Int32>(rInfo.nFtnOffset)); + pParts[1] = OUString::number(rInfo.nFtnOffset); nParts = 2; } if( !rInfo.GetPrefix().isEmpty() ) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b2cf7e303a75..ae4770aca767 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2779,10 +2779,10 @@ void DocxAttributeOutput::SectionFormProtection( bool bProtected ) void DocxAttributeOutput::SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ) { FastAttributeList* pAttr = m_pSerializer->createAttrList(); - pAttr->add( FSNS( XML_w, XML_countBy ), OString::valueOf(static_cast<sal_Int32>(rLnNumInfo.GetCountBy())).getStr()); + pAttr->add( FSNS( XML_w, XML_countBy ), OString::number(rLnNumInfo.GetCountBy()).getStr()); pAttr->add( FSNS( XML_w, XML_restart ), rLnNumInfo.IsRestartEachPage() ? "newPage" : "continuous" ); if( rLnNumInfo.GetPosFromLeft()) - pAttr->add( FSNS( XML_w, XML_distance ), OString::valueOf(static_cast<sal_Int32>(rLnNumInfo.GetPosFromLeft())).getStr()); + pAttr->add( FSNS( XML_w, XML_distance ), OString::number(rLnNumInfo.GetPosFromLeft()).getStr()); if( nRestartNo ) pAttr->add( FSNS( XML_w, XML_start ), OString::valueOf( long( nRestartNo )).getStr()); XFastAttributeListRef xAttrs( pAttr ); @@ -2990,7 +2990,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, const c if( file.open( osl_File_OpenFlag_Write ) != osl::File::E_None ) return; uno::Reference< com::sun::star::io::XOutputStream > xOutStream = m_rExport.GetFilter().openFragmentStream( - OUString( "word/fonts/font" ) + OUString::valueOf( static_cast< sal_Int32 >( m_nextFontId )) + ".ttf", + OUString( "word/fonts/font" ) + OUString::number(m_nextFontId) + ".ttf", "application/vnd.openxmlformats-officedocument.obfuscatedFont" ); // Not much point in trying hard with the obfuscation key, whoever reads the spec can read the font anyway, // so just alter the first and last part of the key. @@ -3041,7 +3041,7 @@ void DocxAttributeOutput::EmbedFontStyle( const OUString& name, int tag, const c xOutStream->closeOutput(); OString relId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(), "http://schemas.openxmlformats.org/officeDocument/2006/relationships/font", - OUString( "fonts/font" ) + OUString::valueOf( static_cast< sal_Int32 >( m_nextFontId )) + ".ttf" ), RTL_TEXTENCODING_UTF8 ); + OUString( "fonts/font" ) + OUString::number(m_nextFontId) + ".ttf" ), RTL_TEXTENCODING_UTF8 ); m_pSerializer->singleElementNS( XML_w, tag, FSNS( XML_r, XML_id ), relId.getStr(), FSNS( XML_w, XML_fontKey ), fontKeyStr, @@ -3178,7 +3178,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel, m_pSerializer->startElementNS( XML_w, XML_tabs, FSEND ); m_pSerializer->singleElementNS( XML_w, XML_tab, FSNS( XML_w, XML_val ), "num", - FSNS( XML_w, XML_pos ), OString::valueOf( static_cast<sal_Int32>(nListTabPos) ).getStr(), + FSNS( XML_w, XML_pos ), OString::number( nListTabPos ).getStr(), FSEND ); m_pSerializer->endElementNS( XML_w, XML_tabs ); } diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 5264293ccd6e..ff777ace9502 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -50,7 +50,7 @@ namespace { void setValue(FixedText *pWidget, sal_uLong nValue) { - rtl::OUString sValue(rtl::OUString::valueOf(static_cast<sal_Int64>(nValue))); + rtl::OUString sValue(OUString::number(nValue)); pWidget->SetText(sValue); } } diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 1ae6d52b8c49..33266ad6f25f 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -1246,10 +1246,10 @@ void SwView::StateStatusLine(SfxItemSet &rSet) const sal_uInt32 stringId = selectionStats.nWord? STR_STATUSBAR_WORDCOUNT : STR_STATUSBAR_WORDCOUNT_NO_SELECTION; rtl::OUString wordCount(SW_RES(stringId)); - wordCount = wordCount.replaceAll("$1", rtl::OUString::valueOf(static_cast<sal_Int64>(documentStats.nWord))); + wordCount = wordCount.replaceAll("$1", OUString::number(documentStats.nWord)); if (selectionStats.nWord) { - wordCount = wordCount.replaceAll("$2", rtl::OUString::valueOf(static_cast<sal_Int64>(selectionStats.nWord))); + wordCount = wordCount.replaceAll("$2", OUString::number(selectionStats.nWord)); } rSet.Put(SfxStringItem(FN_STAT_WORDCOUNT, wordCount)); diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx index 5b6a4c9ea49c..4d03bcf2e7ce 100644 --- a/sw/source/ui/utlui/attrdesc.cxx +++ b/sw/source/ui/utlui/attrdesc.cxx @@ -1095,7 +1095,7 @@ SfxItemPresentation SwRotationGrf::GetPresentation( rText = SW_RESSTR( STR_ROTATION ); else if( rText.Len() ) rText.Erase(); - ( rText += OUString::valueOf( static_cast<sal_Int32>( GetValue() ) )) += '\xB0'; + ( rText += OUString::number( GetValue() )) += '\xB0'; break; default: @@ -1118,7 +1118,7 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation( rText = SW_RESSTR( STR_LUMINANCE ); else if( rText.Len() ) rText.Erase(); - ( rText += OUString::valueOf( static_cast<sal_Int32>( GetValue() ) )) += '%'; + ( rText += OUString::number( GetValue() )) += '%'; break; default: @@ -1141,7 +1141,7 @@ SfxItemPresentation SwContrastGrf::GetPresentation( rText = SW_RESSTR( STR_CONTRAST ); else if( rText.Len() ) rText.Erase(); - ( rText += OUString::valueOf( static_cast<sal_Int32>( GetValue() ) )) += '%'; + ( rText += OUString::number( GetValue() )) += '%'; break; default: @@ -1177,7 +1177,7 @@ SfxItemPresentation SwChannelGrf::GetPresentation( } else if( rText.Len() ) rText.Erase(); - ( rText += OUString::valueOf( static_cast<sal_Int32>( GetValue() ) )) += '%'; + ( rText += OUString::number( GetValue() )) += '%'; break; default: @@ -1245,7 +1245,7 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation( rText = SW_RESSTR( STR_TRANSPARENCY ); else if( rText.Len() ) rText.Erase(); - ( rText += OUString::valueOf( static_cast<sal_Int32>( GetValue() ) )) += '%'; + ( rText += OUString::number( GetValue() )) += '%'; break; default: diff --git a/tools/bootstrp/mkunroll/mkunroll.cxx b/tools/bootstrp/mkunroll/mkunroll.cxx index cc417e0be9a6..8f4c9359e510 100644 --- a/tools/bootstrp/mkunroll/mkunroll.cxx +++ b/tools/bootstrp/mkunroll/mkunroll.cxx @@ -201,7 +201,7 @@ void MkFilter::Filter() for ( size_t i=0; i<nCount; i++ ) { MkLine *pMkLine = (*pLine->pPrivateTnrLst)[ i ]; - rtl::OString aLine = pMkLine->aLine.replaceAll(aTnr, rtl::OString::valueOf(static_cast<sal_Int32>(n))); + rtl::OString aLine = pMkLine->aLine.replaceAll(aTnr, OString::number(n)); fputs( aLine.getStr(), pOut ); fprintf( stderr, "o" ); } diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 0f3d43cc2c5f..17b75ee5a1d0 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -702,7 +702,7 @@ UniString GetTypeRes_Impl( const ResId& rTypeId ) { // Return on resource errors static int bInUse = sal_False; - rtl::OUString aTypStr(OUString::valueOf(static_cast<sal_Int32>(rTypeId.GetId()))); + rtl::OUString aTypStr(OUString::number(rTypeId.GetId())); if ( !bInUse ) { diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index fdba04b8bd09..ab0697957deb 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -1066,7 +1066,7 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput, { OUString aId( xContentAccess-> queryContentIdentifierString() ); - aText = OUString::valueOf( static_cast<sal_Int64>(++n) ) + ") " + aId + " : "; + aText = OUString::number( ++n ) + ") " + aId + " : "; } // Title: @@ -1150,7 +1150,7 @@ void UcbContent::open( const rtl::OUString & rName, const UniString& rInput, if ( bTiming ) { nTime = Time::GetSystemTicks() - nTime; - OUString aText = "Operation took " + OUString::valueOf(static_cast<sal_Int64>(nTime)) + " ms."; + OUString aText = "Operation took " + OUString::number(nTime) + " ms."; print( aText ); } } @@ -1176,7 +1176,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort, OUString aText; for ( sal_uInt32 i = aEntry.m_nLevel; i != 0; --i ) aText += '='; - aText = aText + "LEVEL " + OUString::valueOf(static_cast<sal_Int64>(aEntry.m_nLevel)); + aText = aText + "LEVEL " + OUString::number(aEntry.m_nLevel); uno::Reference< ucb::XContentIdentifier > xID; if ( aEntry.m_bUseIdentifier ) @@ -1225,7 +1225,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort, if ( bTiming ) { nTime = Time::GetSystemTicks() - nTime; - OUString aText = "Operation took " + OUString::valueOf(static_cast<sal_Int64>(nTime)) + " ms."; + OUString aText = "Operation took " + OUString::number(nTime) + " ms."; print( aText ); } } diff --git a/unotest/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx index b92069b418f7..966dc3e29232 100644 --- a/unotest/source/cpp/toabsolutefileurl.cxx +++ b/unotest/source/cpp/toabsolutefileurl.cxx @@ -37,7 +37,7 @@ rtl::OUString toAbsoluteFileUrl(rtl::OUString const & relativePathname) { (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "osl_getProcessWorkingDir failed with ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(e1))), + OUString::number(e1)), css::uno::Reference< css::uno::XInterface >()); } rtl::OUString url; @@ -50,7 +50,7 @@ rtl::OUString toAbsoluteFileUrl(rtl::OUString const & relativePathname) { "osl::FileBase::getFileURLFromSystemPath(")) + relativePathname + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(") failed with ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(e2))), + OUString::number(e2)), css::uno::Reference< css::uno::XInterface >()); } rtl::OUString absUrl; @@ -62,7 +62,7 @@ rtl::OUString toAbsoluteFileUrl(rtl::OUString const & relativePathname) { "osl::FileBase::getAbsoluteFileURL(")) + cwd + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ")) + url + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(") failed with ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(e2))), + OUString::number(e2)), css::uno::Reference< css::uno::XInterface >()); } return absUrl; diff --git a/unotest/source/cpp/uniquepipename.cxx b/unotest/source/cpp/uniquepipename.cxx index f7a67c0edb13..667bc33ac1da 100644 --- a/unotest/source/cpp/uniquepipename.cxx +++ b/unotest/source/cpp/uniquepipename.cxx @@ -32,7 +32,7 @@ rtl::OUString uniquePipeName(rtl::OUString const & name) { CPPUNIT_ASSERT_EQUAL( osl_Process_E_None, osl_getProcessInfo(0, osl_Process_IDENTIFIER, &info)); - return name + rtl::OUString::valueOf(static_cast< sal_Int64 >(info.Ident)); + return name + OUString::number(info.Ident); } } diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx index e73c6aa9dbb4..c460558f641d 100644 --- a/vcl/generic/print/common_gfx.cxx +++ b/vcl/generic/print/common_gfx.cxx @@ -1204,7 +1204,7 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize static sal_uInt16 nEps = 0; if( aDocTitle.isEmpty() ) - aDocTitle = rtl::OString::valueOf(static_cast<sal_Int32>(nEps++)); + aDocTitle = OString::number(nEps++); if( fLeft != fRight && fTop != fBottom ) { diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index a18d0b286a68..583d6ce5ddd3 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -808,7 +808,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri //Make up a name for it OString sTabPageId = get_by_window(pParent) + OString("-page") + - OString::valueOf(static_cast<sal_Int32>(nNewPageCount)); + OString::number(nNewPageCount); m_aChildren.push_back(WinAndId(sTabPageId, pPage, false)); pPage->SetHelpId(m_sHelpRoot + sTabPageId); diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx index 45832604fd19..c77b68249492 100644 --- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx +++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx @@ -300,7 +300,7 @@ int WW8IntValue::getInt() const OUString WW8IntValue::getString() const { - return OUString::valueOf(static_cast<sal_Int32>(mValue)); + return OUString::number(mValue); } uno::Any WW8IntValue::getAny() const diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx index a0aaf0841ffd..e4dd41fbc4b1 100644 --- a/writerfilter/source/rtftok/rtfvalue.cxx +++ b/writerfilter/source/rtftok/rtfvalue.cxx @@ -193,7 +193,7 @@ std::string RTFValue::toString() const if (!m_sValue.isEmpty() || m_bForceString) return OUStringToOString(m_sValue, RTL_TEXTENCODING_UTF8).getStr(); else - return OString::valueOf(static_cast<sal_Int32>(m_nValue)).getStr(); + return OString::number(m_nValue).getStr(); } RTFValue* RTFValue::Clone() diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 6e0218aaad94..f9626f8c2f59 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -2119,7 +2119,7 @@ void XMLShapeExport::ImpExportMediaShape( const OUString aVolumeDBStr( "VolumeDB" ); xPropSet->getPropertyValue( OUString( "VolumeDB" ) ) >>= nVolumeDB; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aVolumeDBStr ); - mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, OUString::valueOf( static_cast< sal_Int32 >( nVolumeDB ) ) ); + mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, OUString::number( nVolumeDB ) ); delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); media::ZoomLevel eZoom; diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index 129ee5310e94..cfdad6f497f9 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -73,7 +73,7 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl) throw css::uno::RuntimeException( (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot open ")) + fileUrl_ + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + - rtl::OUString::valueOf(static_cast< sal_Int32 >(e))), + OUString::number(e)), css::uno::Reference< css::uno::XInterface >()); } e = osl_getFileSize(fileHandle_, &fileSize_); @@ -91,7 +91,7 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl) } throw css::uno::RuntimeException( ("cannot mmap " + fileUrl_ + " (" + - rtl::OUString::valueOf(static_cast< sal_Int32 >(e)) + ")"), + OUString::number(e) + ")"), css::uno::Reference< css::uno::XInterface >()); } namespaceIris_.push_back( |