diff options
Diffstat (limited to 'sc/source')
48 files changed, 176 insertions, 176 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index da101f6fdfb8..26f561a44fa1 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1069,26 +1069,26 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_BEGINS_WITH: if(aStrVal1.isEmpty()) { - OUString aStr = OUString::valueOf(nVal1); - OUString aStr2 = OUString::valueOf(nArg); + OUString aStr = OUString::number(nVal1); + OUString aStr2 = OUString::number(nArg); bValid = aStr2.indexOf(aStr) == 0; } else { - OUString aStr2 = OUString::valueOf(nArg); + OUString aStr2 = OUString::number(nArg); bValid = aStr2.indexOf(aStrVal1) == 0; } break; case SC_COND_ENDS_WITH: if(aStrVal1.isEmpty()) { - OUString aStr = OUString::valueOf(nVal1); - OUString aStr2 = OUString::valueOf(nArg); + OUString aStr = OUString::number(nVal1); + OUString aStr2 = OUString::number(nArg); bValid = aStr2.endsWith(aStr) == 0; } else { - OUString aStr2 = OUString::valueOf(nArg); + OUString aStr2 = OUString::number(nArg); bValid = aStr2.endsWith(aStrVal1) == 0; } break; @@ -1096,13 +1096,13 @@ bool ScConditionEntry::IsValid( double nArg, const ScAddress& rPos ) const case SC_COND_NOT_CONTAINS_TEXT: if(aStrVal1.isEmpty()) { - OUString aStr = OUString::valueOf(nVal1); - OUString aStr2 = OUString::valueOf(nArg); + OUString aStr = OUString::number(nVal1); + OUString aStr2 = OUString::number(nArg); bValid = aStr2.indexOf(aStr) != -1; } else { - OUString aStr2 = OUString::valueOf(nArg); + OUString aStr2 = OUString::number(nArg); bValid = aStr2.indexOf(aStrVal1) != -1; } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index db97f7773e6c..f316581c7c23 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -156,7 +156,7 @@ void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck ) const ScDefaultsOptions& rOpt = SC_MOD()->GetDefaultsOptions(); OUString aString = rOpt.GetInitTabPrefix(); - aString += OUString::valueOf(static_cast<sal_Int32>(nTab+1)); + aString += OUString::number(nTab+1); if ( _bNeedsNameCheck ) CreateValidTabName( aString ); // no doubles if (nTab < static_cast<SCTAB>(maTabs.size())) diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx index c417317ff1fd..0598379dc586 100644 --- a/sc/source/core/data/dpitemdata.cxx +++ b/sc/source/core/data/dpitemdata.cxx @@ -365,9 +365,9 @@ OUString ScDPItemData::GetString() const return *mpString; case Value: case RangeStart: - return OUString::valueOf(mfValue); + return OUString::number(mfValue); case GroupValue: - return OUString::valueOf(maGroupValue.mnValue); + return OUString::number(maGroupValue.mnValue); case Empty: default: ; diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 17b0fab6ac33..6e5d243dc163 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -2559,7 +2559,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const ; } if (aName.isEmpty()) - aName = OUString::valueOf(nVal); + aName = OUString::number(nVal); ScDPItemData aData(nGroupBy, nVal); SCROW nId = pSource->GetCache()->GetIdByItemData(nDim, aData); diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index 7952c1076205..3e4a290b9504 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -92,7 +92,7 @@ OUString ScDPUtil::getDateGroupName( switch ( nDatePart ) { case sheet::DataPilotFieldGroupBy::YEARS: - return OUString::valueOf(nValue); + return OUString::number(nValue); case sheet::DataPilotFieldGroupBy::QUARTERS: return ScGlobal::pLocaleData->getQuarterAbbreviation(sal_Int16(nValue-1)); // nValue is 1-based case com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS: diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 3cc1eefd7380..80497c1bf8ee 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1283,7 +1283,7 @@ bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r if ( rDesc.ppDefArgNames[nArg]->isEmpty() ) { OUString aDefName("arg"); - aDefName += OUString::valueOf( nArg+1 ); + aDefName += OUString::number( nArg+1 ); *rDesc.ppDefArgNames[nArg] = aDefName; } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 8935fad0a4c7..0a0a0571c6d2 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -714,7 +714,7 @@ static OUString lcl_GetNumStr(sal_Int32 nNo, SvxNumType eType) // case ARABIC: ist jetzt default default: - aTmpStr = OUString::valueOf(nNo); + aTmpStr = OUString::number(nNo); break; } diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 3d573267fc50..5043272679a3 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2635,7 +2635,7 @@ void ScInterpreter::ScCellExternal() PushString(pToken->GetString()); break; case svDouble: - PushString(OUString::valueOf(pToken->GetDouble())); + PushString(OUString::number(pToken->GetDouble())); break; case svError: PushString(ScGlobal::GetErrorString(pToken->GetError())); diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index e24e122b88d7..938e89ac1efc 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -514,7 +514,7 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) { nHash = ((aHash[0] << 8) & 0xFFFF); nHash |= (aHash[1] & 0xFF); - sHash = OString::valueOf( static_cast<sal_Int32>(nHash), 16 ); + sHash = OString::number( nHash, 16 ); } sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->singleElement( XML_sheetProtection, @@ -646,8 +646,8 @@ static OString lcl_GetValue( sal_uInt8 nType, double fVal, XclExpString* pStr ) switch( nType ) { case EXC_AFTYPE_STRING: return XclXmlUtils::ToOString( *pStr ); - case EXC_AFTYPE_DOUBLE: return OString::valueOf( fVal ); - case EXC_AFTYPE_BOOLERR: return OString::valueOf( (sal_Int32) ( fVal != 0 ? 1 : 0 ) ); + case EXC_AFTYPE_DOUBLE: return OString::number( fVal ); + case EXC_AFTYPE_BOOLERR: return OString::number( ( fVal != 0 ? 1 : 0 ) ); default: return OString(); } } @@ -852,7 +852,7 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElement( XML_filterColumn, - XML_colId, OString::valueOf( (sal_Int32) nCol ).getStr(), + XML_colId, OString::number( nCol ).getStr(), // OOXTODO: XML_hiddenButton, AutoFilter12 fHideArrow? // OOXTODO: XML_showButton, FSEND ); @@ -866,7 +866,7 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->singleElement( XML_top10, XML_top, XclXmlUtils::ToPsz( get_flag( nFlags, EXC_AFFLAG_TOP10TOP ) ), XML_percent, XclXmlUtils::ToPsz( get_flag( nFlags, EXC_AFFLAG_TOP10PERC ) ), - XML_val, OString::valueOf( (sal_Int32) (nFlags >> 7 ) ).getStr(), + XML_val, OString::number( (nFlags >> 7 ) ).getStr(), // OOXTODO: XML_filterVal, FSEND ); } diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 19f2ecc685ad..ceaa95168b64 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -213,8 +213,8 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) pSst->startElement( XML_sst, XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", - XML_count, OString::valueOf( (sal_Int32) mnTotal ).getStr(), - XML_uniqueCount, OString::valueOf( (sal_Int32) mnSize ).getStr(), + XML_count, OString::number( mnTotal ).getStr(), + XML_uniqueCount, OString::number( mnSize ).getStr(), FSEND ); for( XclExpStringList::const_iterator aIt = maStringList.begin(), aEnd = maStringList.end(); aIt != aEnd; ++aIt ) @@ -312,7 +312,7 @@ void XclExpMergedcells::SaveXml( XclExpXmlStream& rStrm ) return; sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElement( XML_mergeCells, - XML_count, OString::valueOf( (sal_Int32) nCount ).getStr(), + XML_count, OString::number( nCount ).getStr(), FSEND ); for( size_t i = 0; i < nCount; ++i ) { @@ -923,15 +923,15 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElement( XML_cfRule, XML_type, GetTypeString( mrFormatEntry.GetOperation() ), - XML_priority, OString::valueOf( mnPriority + 1 ).getStr(), + XML_priority, OString::number( mnPriority + 1 ).getStr(), XML_operator, GetOperatorString( mrFormatEntry.GetOperation(), bFmla2 ), - XML_aboveAverage, OString::valueOf( nAboveAverage ).getStr(), - XML_equalAverage, OString::valueOf( nEqualAverage ).getStr(), - XML_bottom, OString::valueOf( nBottom ).getStr(), - XML_percent, OString::valueOf( nPercent ).getStr(), + XML_aboveAverage, OString::number( nAboveAverage ).getStr(), + XML_equalAverage, OString::number( nEqualAverage ).getStr(), + XML_bottom, OString::number( nBottom ).getStr(), + XML_percent, OString::number( nPercent ).getStr(), XML_rank, aRank.getStr(), XML_text, aText.getStr(), - XML_dxfId, OString::valueOf( GetDxfs().GetDxfId( mrFormatEntry.GetStyle() ) ).getStr(), + XML_dxfId, OString::number( GetDxfs().GetDxfId( mrFormatEntry.GetStyle() ) ).getStr(), FSEND ); if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation)) { @@ -1030,9 +1030,9 @@ void XclExpDateFormat::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElement( XML_cfRule, XML_type, "timePeriod", - XML_priority, OString::valueOf( mnPriority + 1 ).getStr(), + XML_priority, OString::number( mnPriority + 1 ).getStr(), XML_timePeriod, sTimePeriod, - XML_dxfId, OString::valueOf( GetDxfs().GetDxfId( mrFormatEntry.GetStyleName() ) ).getStr(), + XML_dxfId, OString::number( GetDxfs().GetDxfId( mrFormatEntry.GetStyleName() ) ).getStr(), FSEND ); rWorksheet->endElement( XML_cfRule); } @@ -1089,7 +1089,7 @@ void XclExpCfvo::SaveXml( XclExpXmlStream& rStrm ) } else { - aValue = OString::valueOf( mrEntry.GetValue() ); + aValue = OString::number( mrEntry.GetValue() ); } rWorksheet->startElement( XML_cfvo, @@ -1222,7 +1222,7 @@ void XclExpColorScale::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->startElement( XML_cfRule, XML_type, "colorScale", - XML_priority, OString::valueOf( mnPriority + 1 ).getStr(), + XML_priority, OString::number( mnPriority + 1 ).getStr(), FSEND ); rWorksheet->startElement( XML_colorScale, FSEND ); @@ -1239,7 +1239,7 @@ namespace { OString createHexStringFromDigit(sal_uInt8 nDigit) { - OString aString = OString::valueOf( static_cast<sal_Int32>(nDigit), 16 ); + OString aString = OString::number( nDigit, 16 ); if(aString.getLength() == 1) aString = aString + OString::number(0); return aString; @@ -1296,7 +1296,7 @@ void XclExpDataBar::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->startElement( XML_cfRule, XML_type, "dataBar", - XML_priority, OString::valueOf( mnPriority + 1 ).getStr(), + XML_priority, OString::number( mnPriority + 1 ).getStr(), FSEND ); rWorksheet->startElement( XML_dataBar, FSEND ); @@ -1364,7 +1364,7 @@ void XclExpIconSet::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->startElement( XML_cfRule, XML_type, "iconSet", - XML_priority, OString::valueOf( mnPriority + 1 ).getStr(), + XML_priority, OString::number( mnPriority + 1 ).getStr(), FSEND ); const char* pIconSetName = getIconSetName(mrFormat.GetIconSetData()->eIconSetType); @@ -1732,7 +1732,7 @@ void XclExpDval::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElement( XML_dataValidations, - XML_count, OString::valueOf( (sal_Int32) maDVList.GetSize() ).getStr(), + XML_count, OString::number( maDVList.GetSize() ).getStr(), // OOXTODO: XML_disablePrompts, // OOXTODO: XML_xWindow, // OOXTODO: XML_yWindow, diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 54f9eac08f06..486976c415e0 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -143,16 +143,16 @@ static const char *ToVertAlign( SdrTextVertAdjust eAdjust ) static void lcl_WriteAnchorVertex( sax_fastparser::FSHelperPtr rComments, Rectangle &aRect ) { rComments->startElement( FSNS( XML_xdr, XML_col ), FSEND ); - rComments->writeEscaped( OUString::valueOf( aRect.Left() ) ); + rComments->writeEscaped( OUString::number( aRect.Left() ) ); rComments->endElement( FSNS( XML_xdr, XML_col ) ); rComments->startElement( FSNS( XML_xdr, XML_colOff ), FSEND ); - rComments->writeEscaped( OUString::valueOf( aRect.Top() ) ); + rComments->writeEscaped( OUString::number( aRect.Top() ) ); rComments->endElement( FSNS( XML_xdr, XML_colOff ) ); rComments->startElement( FSNS( XML_xdr, XML_row ), FSEND ); - rComments->writeEscaped( OUString::valueOf( aRect.Right() ) ); + rComments->writeEscaped( OUString::number( aRect.Right() ) ); rComments->endElement( FSNS( XML_xdr, XML_row ) ); rComments->startElement( FSNS( XML_xdr, XML_rowOff ), FSEND ); - rComments->writeEscaped( OUString::valueOf( aRect.Bottom() ) ); + rComments->writeEscaped( OUString::number( aRect.Bottom() ) ); rComments->endElement( FSNS( XML_xdr, XML_rowOff ) ); } #endif @@ -1334,7 +1334,7 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ) rComments->startElement( XML_comment, XML_ref, XclXmlUtils::ToOString( maScPos ).getStr(), - XML_authorId, OString::valueOf( nAuthorId ).getStr(), + XML_authorId, OString::number( nAuthorId ).getStr(), // OOXTODO: XML_guid, FSEND ); rComments->startElement( XML_text, FSEND ); diff --git a/sc/source/filter/excel/xeextlst.cxx b/sc/source/filter/excel/xeextlst.cxx index 58594fe01a13..92fb6c6bac7f 100644 --- a/sc/source/filter/excel/xeextlst.cxx +++ b/sc/source/filter/excel/xeextlst.cxx @@ -68,7 +68,7 @@ XclExpExtCfvo::XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& maValue = OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 ); } else - maValue = OString::valueOf(rEntry.GetValue()); + maValue = OString::number(rEntry.GetValue()); } namespace { diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 54f2e8d867db..ca472a6d665f 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -319,7 +319,7 @@ void XclExpName::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_functionGroupId, "", // OOXTODO: XML_help, "", XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_NAME_HIDDEN ) ), - XML_localSheetId, mnScTab == SCTAB_GLOBAL ? NULL : OString::valueOf( (sal_Int32)mnScTab ).getStr(), + XML_localSheetId, mnScTab == SCTAB_GLOBAL ? NULL : OString::number( mnScTab ).getStr(), XML_name, XclXmlUtils::ToOString( maOrigName ).getStr(), // OOXTODO: XML_publishToServer, "", // OOXTODO: XML_shortcutKey, "", diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 370188788a34..4092eb89d375 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -89,18 +89,18 @@ void XclExpSetup::SaveXml( XclExpXmlStream& rStrm ) if( rStrm.getVersion() != oox::core::ISOIEC_29500_2008 || mrData.mnStrictPaperSize != EXC_PAPERSIZE_USER ) { - pAttrList->add( XML_paperSize, OString::valueOf( (sal_Int32) mrData.mnPaperSize ).getStr() ); + pAttrList->add( XML_paperSize, OString::number( mrData.mnPaperSize ).getStr() ); } else { - pAttrList->add( XML_paperWidth, OString::valueOf( (sal_Int32) mrData.mnPaperWidth ).concat(OString("mm")).getStr() ); - pAttrList->add( XML_paperHeight, OString::valueOf( (sal_Int32) mrData.mnPaperHeight ).concat(OString("mm")).getStr() ); + pAttrList->add( XML_paperWidth, OString::number( mrData.mnPaperWidth ).concat(OString("mm")).getStr() ); + pAttrList->add( XML_paperHeight, OString::number( mrData.mnPaperHeight ).concat(OString("mm")).getStr() ); // pAttrList->add( XML_paperUnits, "mm" ); } - pAttrList->add( XML_scale, OString::valueOf( (sal_Int32) mrData.mnScaling ).getStr() ); - pAttrList->add( XML_firstPageNumber, OString::valueOf( (sal_Int32) mrData.mnStartPage ).getStr() ); - pAttrList->add( XML_fitToWidth, OString::valueOf( (sal_Int32) mrData.mnFitToWidth ).getStr() ); - pAttrList->add( XML_fitToHeight, OString::valueOf( (sal_Int32) mrData.mnFitToHeight ).getStr() ); + pAttrList->add( XML_scale, OString::number( mrData.mnScaling ).getStr() ); + pAttrList->add( XML_firstPageNumber, OString::number( mrData.mnStartPage ).getStr() ); + pAttrList->add( XML_fitToWidth, OString::number( mrData.mnFitToWidth ).getStr() ); + pAttrList->add( XML_fitToHeight, OString::number( mrData.mnFitToHeight ).getStr() ); pAttrList->add( XML_pageOrder, mrData.mbPrintInRows ? "overThenDown" : "downThenOver" ); pAttrList->add( XML_orientation, mrData.mbPortrait ? "portrait" : "landscape" ); // OOXTODO: "default"? pAttrList->add( XML_usePrinterDefaults, XclXmlUtils::ToPsz( !mrData.mbValid ) ); @@ -109,9 +109,9 @@ void XclExpSetup::SaveXml( XclExpXmlStream& rStrm ) pAttrList->add( XML_cellComments, mrData.mbPrintNotes ? "atEnd" : "none" ); // OOXTODO: "asDisplayed"? pAttrList->add( XML_useFirstPageNumber, XclXmlUtils::ToPsz( mrData.mbManualStart ) ); // OOXTODO: XML_errors, // == displayed|blank|dash|NA - pAttrList->add( XML_horizontalDpi, OString::valueOf( (sal_Int32) mrData.mnHorPrintRes ).getStr() ); - pAttrList->add( XML_verticalDpi, OString::valueOf( (sal_Int32) mrData.mnVerPrintRes ).getStr() ); - pAttrList->add( XML_copies, OString::valueOf( (sal_Int32) mrData.mnCopies ).getStr() ); + pAttrList->add( XML_horizontalDpi, OString::number( mrData.mnHorPrintRes ).getStr() ); + pAttrList->add( XML_verticalDpi, OString::number( mrData.mnVerPrintRes ).getStr() ); + pAttrList->add( XML_copies, OString::number( mrData.mnCopies ).getStr() ); // OOXTODO: devMode settings part RelationshipId: FSNS( XML_r, XML_id ), ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList > aAttrs(pAttrList); @@ -185,7 +185,7 @@ void XclExpPageBreaks::SaveXml( XclExpXmlStream& rStrm ) sal_Int32 nElement = GetRecId() == EXC_ID_HORPAGEBREAKS ? XML_rowBreaks : XML_colBreaks; sax_fastparser::FSHelperPtr& pWorksheet = rStrm.GetCurrentStream(); - OString sNumPageBreaks = OString::valueOf( (sal_Int32) mrPageBreaks.size() ); + OString sNumPageBreaks = OString::number( mrPageBreaks.size() ); pWorksheet->startElement( nElement, XML_count, sNumPageBreaks.getStr(), XML_manualBreakCount, sNumPageBreaks.getStr(), @@ -193,9 +193,9 @@ void XclExpPageBreaks::SaveXml( XclExpXmlStream& rStrm ) for( ScfUInt16Vec::const_iterator aIt = mrPageBreaks.begin(), aEnd = mrPageBreaks.end(); aIt != aEnd; ++aIt ) { pWorksheet->singleElement( XML_brk, - XML_id, OString::valueOf( (sal_Int32) *aIt ).getStr(), + XML_id, OString::number( *aIt ).getStr(), XML_man, "true", - XML_max, OString::valueOf( (sal_Int32) mnMaxPos ).getStr(), + XML_max, OString::number( mnMaxPos ).getStr(), XML_min, "0", // OOXTODO: XML_pt, "", FSEND ); diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index a3f269b9dbe1..c9214942f839 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -752,7 +752,7 @@ void XclExpPivotCache::SaveXml( XclExpXmlStream& .append( rStrm.GetUniqueIdOUString() ) .makeStringAndClear(); rWorkbook->startElement( XML_pivotCache, - XML_cacheId, OString::valueOf( (sal_Int32)maPCInfo.mnStrmId ).getStr(), + XML_cacheId, OString::number( maPCInfo.mnStrmId ).getStr(), FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), FSEND ); // SXIDSTM @@ -1362,10 +1362,10 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) aPivotTableDefinition->startElement( XML_pivotTableDefinition, XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", XML_name, XclXmlUtils::ToOString( maPTInfo.maTableName ).getStr(), - XML_cacheId, OString::valueOf( (sal_Int32) maPTInfo.mnCacheIdx ).getStr(), + XML_cacheId, OString::number( maPTInfo.mnCacheIdx ).getStr(), XML_dataOnRows, XclXmlUtils::ToPsz( maPTInfo.mnDataAxis == EXC_SXVD_AXIS_COL ), - XML_dataPosition, OString::valueOf( (sal_Int32) maPTInfo.mnDataPos ).getStr(), - XML_autoFormatId, OString::valueOf( (sal_Int32) maPTInfo.mnAutoFmtIdx ).getStr(), + XML_dataPosition, OString::number( maPTInfo.mnDataPos ).getStr(), + XML_autoFormatId, OString::number( maPTInfo.mnAutoFmtIdx ).getStr(), // OOXTODO: XML_applyNumberFormats, [ SXVIEW fAtrNum (maPTInfo.mnFlags) ] // OOXTODO: XML_applyBorderFormats, [ SXVIEW fAtrBdr (maPTInfo.mnFlags) ] // OOXTODO: XML_applyFontFormats, [ SXVIEW fAtrFnt (maPTInfo.mnFlags) ] @@ -1432,11 +1432,11 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) aPivotTableDefinition->singleElement( XML_location, XML_ref, XclXmlUtils::ToOString( maPTInfo.maOutXclRange ).getStr(), - XML_firstHeaderRow, OString::valueOf( (sal_Int32) maPTInfo.mnFirstHeadRow ).getStr(), - XML_firstDataRow, OString::valueOf( (sal_Int32) maPTInfo.maDataXclPos.mnRow ).getStr(), - XML_firstDataCol, OString::valueOf( (sal_Int32) maPTInfo.maDataXclPos.mnCol ).getStr(), - XML_rowPageCount, OString::valueOf( (sal_Int32) maPTInfo.mnDataRows ).getStr(), // OOXTODO? - XML_colPageCount, OString::valueOf( (sal_Int32) maPTInfo.mnDataCols ).getStr(), // OOXTODO? + XML_firstHeaderRow, OString::number( maPTInfo.mnFirstHeadRow ).getStr(), + XML_firstDataRow, OString::number( maPTInfo.maDataXclPos.mnRow ).getStr(), + XML_firstDataCol, OString::number( maPTInfo.maDataXclPos.mnCol ).getStr(), + XML_rowPageCount, OString::number( maPTInfo.mnDataRows ).getStr(), // OOXTODO? + XML_colPageCount, OString::number( maPTInfo.mnDataCols ).getStr(), // OOXTODO? FSEND ); // OOXTODO: XML_pivotFields @@ -1445,7 +1445,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) if( maPTInfo.mnRowFields ) { aPivotTableDefinition->startElement( XML_rowFields, - XML_count, OString::valueOf( (sal_Int32) maPTInfo.mnRowFields ).getStr(), + XML_count, OString::number( maPTInfo.mnRowFields ).getStr(), FSEND ); aPivotTableDefinition->endElement( XML_rowFields ); } @@ -1455,7 +1455,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) if( maPTInfo.mnColFields ) { aPivotTableDefinition->startElement( XML_colFields, - XML_count, OString::valueOf( (sal_Int32) maPTInfo.mnColFields ).getStr(), + XML_count, OString::number( maPTInfo.mnColFields ).getStr(), FSEND ); aPivotTableDefinition->endElement( XML_colFields ); } @@ -1465,7 +1465,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) if( maPTInfo.mnPageFields ) { aPivotTableDefinition->startElement( XML_pageFields, - XML_count, OString::valueOf( (sal_Int32) maPTInfo.mnPageFields ).getStr(), + XML_count, OString::number( maPTInfo.mnPageFields ).getStr(), FSEND ); aPivotTableDefinition->endElement( XML_pageFields ); } @@ -1473,7 +1473,7 @@ void XclExpPivotTable::SaveXml( XclExpXmlStream& rStrm ) if( maPTInfo.mnDataFields ) { aPivotTableDefinition->startElement( XML_dataFields, - XML_count, OString::valueOf( (sal_Int32) maPTInfo.mnDataFields ).getStr(), + XML_count, OString::number( maPTInfo.mnDataFields ).getStr(), FSEND ); aPivotTableDefinition->endElement( XML_dataFields ); } diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 4c1c5e0c2ebc..94f0d31a028a 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -172,7 +172,7 @@ void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) if( mnAttribute == -1 ) return; rStrm.WriteAttributes( - mnAttribute, OString::valueOf( maValue ).getStr(), + mnAttribute, OString::number( maValue ).getStr(), FSEND ); } diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index c90719a9d41b..16576b6dfcf1 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -689,7 +689,7 @@ void XclXmlUtils::GetFormulaTypeAndValue( ScFormulaCell& rCell, const char*& rsT { // either value or error code rsType = "n"; - rsValue = OUString::valueOf( rCell.GetValue() ); + rsValue = OUString::number( rCell.GetValue() ); } break; @@ -957,7 +957,7 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper lcl_WriteValue( pStream, XML_shadow, rFontData.mbShadow ? XclXmlUtils::ToPsz( rFontData.mbShadow ) : NULL ); lcl_WriteValue( pStream, XML_u, bHaveUnderline ? pUnderline : NULL ); lcl_WriteValue( pStream, XML_vertAlign, bHaveVertAlign ? pVertAlign : NULL ); - lcl_WriteValue( pStream, XML_sz, OString::valueOf( (double) (rFontData.mnHeight / 20.0) ).getStr() ); // Twips->Pt + lcl_WriteValue( pStream, XML_sz, OString::number( (double) (rFontData.mnHeight / 20.0) ).getStr() ); // Twips->Pt if( rFontData.maColor != Color( 0xFF, 0xFF, 0xFF, 0xFF ) ) pStream->singleElement( XML_color, // OOXTODO: XML_auto, bool @@ -967,8 +967,8 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper // OOXTODO: XML_tint, double FSEND ); lcl_WriteValue( pStream, nFontId, XclXmlUtils::ToOString( rFontData.maName ).getStr() ); - lcl_WriteValue( pStream, XML_family, OString::valueOf( (sal_Int32) rFontData.mnFamily ).getStr() ); - lcl_WriteValue( pStream, XML_charset, rFontData.mnCharSet != 0 ? OString::valueOf( (sal_Int32) rFontData.mnCharSet ).getStr() : NULL ); + lcl_WriteValue( pStream, XML_family, OString::number( rFontData.mnFamily ).getStr() ); + lcl_WriteValue( pStream, XML_charset, rFontData.mnCharSet != 0 ? OString::number( rFontData.mnCharSet ).getStr() : NULL ); return pStream; } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 8158af522ef4..2c2ece8086b6 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -1129,7 +1129,7 @@ void XclExpFontBuffer::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->startElement( XML_fonts, - XML_count, OString::valueOf( (sal_Int32) maFontList.GetSize() ).getStr(), + XML_count, OString::number( maFontList.GetSize() ).getStr(), FSEND ); maFontList.SaveXml( rStrm ); @@ -1279,7 +1279,7 @@ void XclExpNumFmtBuffer::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->startElement( XML_numFmts, - XML_count, OString::valueOf( (sal_Int32) maFormatMap.size() ).getStr(), + XML_count, OString::number( maFormatMap.size() ).getStr(), FSEND ); for( XclExpNumFmtVec::iterator aIt = maFormatMap.begin(), aEnd = maFormatMap.end(); aIt != aEnd; ++aIt ) { @@ -1531,9 +1531,9 @@ void XclExpCellAlign::SaveXml( XclExpXmlStream& rStrm ) const rStrm.GetCurrentStream()->singleElement( XML_alignment, XML_horizontal, ToHorizontalAlignment( mnHorAlign ), XML_vertical, ToVerticalAlignment( mnVerAlign ), - XML_textRotation, OString::valueOf( (sal_Int32) mnRotation ).getStr(), + XML_textRotation, OString::number( mnRotation ).getStr(), XML_wrapText, XclXmlUtils::ToPsz( mbLineBreak ), - XML_indent, OString::valueOf( (sal_Int32) mnIndent ).getStr(), + XML_indent, OString::number( mnIndent ).getStr(), // OOXTODO: XML_relativeIndent, mnIndent? // OOXTODO: XML_justifyLastLine, XML_shrinkToFit, XclXmlUtils::ToPsz( mbShrink ), @@ -2110,11 +2110,11 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) } rStyleSheet->startElement( XML_xf, - XML_numFmtId, OString::valueOf( (sal_Int32) mnXclNumFmt ).getStr(), - XML_fontId, OString::valueOf( (sal_Int32) mnXclFont ).getStr(), - XML_fillId, OString::valueOf( (sal_Int32) mnFillId ).getStr(), - XML_borderId, OString::valueOf( (sal_Int32) mnBorderId ).getStr(), - XML_xfId, IsStyleXF() ? NULL : OString::valueOf( nXfId ).getStr(), + XML_numFmtId, OString::number( mnXclNumFmt ).getStr(), + XML_fontId, OString::number( mnXclFont ).getStr(), + XML_fillId, OString::number( mnFillId ).getStr(), + XML_borderId, OString::number( mnBorderId ).getStr(), + XML_xfId, IsStyleXF() ? NULL : OString::number( nXfId ).getStr(), // OOXTODO: XML_quotePrefix, // OOXTODO: XML_pivotButton, // OOXTODO: XML_applyNumberFormat, ; @@ -2231,11 +2231,11 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm ) nXFId = rStrm.GetRoot().GetXFBuffer().GetXmlStyleIndex( nXFId ); rStrm.GetCurrentStream()->singleElement( XML_cellStyle, XML_name, sName.getStr(), - XML_xfId, OString::valueOf( nXFId ).getStr(), + XML_xfId, OString::number( nXFId ).getStr(), /* mso-excel 2007 complains when it finds builtinId >= 55, it is not * bothered by multiple 54 values. */ #define CELL_STYLE_MAX_BUILTIN_ID 55 - XML_builtinId, OString::valueOf( std::min( static_cast<sal_Int32>( CELL_STYLE_MAX_BUILTIN_ID - 1 ), static_cast <sal_Int32>( mnStyleId ) ) ).getStr(), + XML_builtinId, OString::number( std::min( static_cast<sal_Int32>( CELL_STYLE_MAX_BUILTIN_ID - 1 ), static_cast <sal_Int32>( mnStyleId ) ) ).getStr(), // OOXTODO: XML_iLevel, // OOXTODO: XML_hidden, XML_customBuiltin, XclXmlUtils::ToPsz( ! IsBuiltIn() ), @@ -2519,7 +2519,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); rStyleSheet->startElement( XML_fills, - XML_count, OString::valueOf( (sal_Int32) maFills.size() ).getStr(), + XML_count, OString::number( maFills.size() ).getStr(), FSEND ); for( XclExpFillList::iterator aIt = maFills.begin(), aEnd = maFills.end(); aIt != aEnd; ++aIt ) @@ -2529,7 +2529,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_fills ); rStyleSheet->startElement( XML_borders, - XML_count, OString::valueOf( (sal_Int32) maBorders.size() ).getStr(), + XML_count, OString::number( maBorders.size() ).getStr(), FSEND ); for( XclExpBorderList::iterator aIt = maBorders.begin(), aEnd = maBorders.end(); aIt != aEnd; ++aIt ) @@ -2545,7 +2545,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm ) if( nStyles > 0 ) { rStyleSheet->startElement( XML_cellStyleXfs, - XML_count, OString::valueOf( nStyles ).getStr(), + XML_count, OString::number( nStyles ).getStr(), FSEND ); size_t nXFCount = maSortedXFList.GetSize(); for( size_t i = 0; i < nXFCount; ++i ) @@ -2561,7 +2561,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm ) if( nCells > 0 ) { rStyleSheet->startElement( XML_cellXfs, - XML_count, OString::valueOf( nCells ).getStr(), + XML_count, OString::number( nCells ).getStr(), FSEND ); size_t nXFCount = maSortedXFList.GetSize(); for( size_t i = 0; i < nXFCount; ++i ) @@ -2576,7 +2576,7 @@ void XclExpXFBuffer::SaveXml( XclExpXmlStream& rStrm ) // save all STYLE records rStyleSheet->startElement( XML_cellStyles, - XML_count, OString::valueOf( (sal_Int32) maStyleList.GetSize() ).getStr(), + XML_count, OString::number( maStyleList.GetSize() ).getStr(), FSEND ); maStyleList.SaveXml( rStrm ); rStyleSheet->endElement( XML_cellStyles ); diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index b63aa96f03d7..8b6ed14c23e1 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -577,7 +577,7 @@ XclExpNumberCell::XclExpNumberCell( static OString lcl_GetStyleId( XclExpXmlStream& rStrm, sal_uInt32 nXFIndex ) { - return OString::valueOf( rStrm.GetRoot().GetXFBuffer() + return OString::number( rStrm.GetRoot().GetXFBuffer() .GetXmlCellIndex( nXFIndex ) ); } @@ -1567,12 +1567,12 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) XML_collapsed, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_COLLAPSED ) ), // OOXTODO: XML_customWidth, XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_HIDDEN ) ), - XML_max, OString::valueOf( (sal_Int32) (nLastXclCol+1) ).getStr(), - XML_min, OString::valueOf( (sal_Int32) (mnFirstXclCol+1) ).getStr(), + XML_max, OString::number( (nLastXclCol+1) ).getStr(), + XML_min, OString::number( (mnFirstXclCol+1) ).getStr(), // OOXTODO: XML_outlineLevel, // OOXTODO: XML_phonetic, XML_style, lcl_GetStyleId( rStrm, maXFId.mnXFIndex ).getStr(), - XML_width, OString::valueOf( (double) (mnScWidth / (double)sc::TwipsToHMM( GetCharWidth() )) ).getStr(), + XML_width, OString::number( (double) (mnScWidth / (double)sc::TwipsToHMM( GetCharWidth() )) ).getStr(), FSEND ); } @@ -1990,14 +1990,14 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm ) for ( sal_uInt32 i=0; i<mnXclRowRpt; ++i ) { rWorksheet->startElement( XML_row, - XML_r, OString::valueOf( (sal_Int32) (mnCurrentRow++) ).getStr(), + XML_r, OString::number( (mnCurrentRow++) ).getStr(), // OOXTODO: XML_spans, optional XML_s, haveFormat ? lcl_GetStyleId( rStrm, mnXFIndex ).getStr() : NULL, XML_customFormat, XclXmlUtils::ToPsz( haveFormat ), - XML_ht, OString::valueOf( (double) mnHeight / 20.0 ).getStr(), + XML_ht, OString::number( (double) mnHeight / 20.0 ).getStr(), XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_HIDDEN ) ), XML_customHeight, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_UNSYNCED ) ), - XML_outlineLevel, OString::valueOf( (sal_Int32) mnOutlineLevel ).getStr(), + XML_outlineLevel, OString::number( mnOutlineLevel ).getStr(), XML_collapsed, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_COLLAPSED ) ), // OOXTODO: XML_thickTop, bool // OOXTODO: XML_thickBot, bool @@ -2498,7 +2498,7 @@ void XclExpCellTable::SaveXml( XclExpXmlStream& rStrm ) XclExpDefaultRowData& rDefData = mxDefrowheight->GetDefaultData(); sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElement( XML_sheetFormatPr, - XML_defaultRowHeight, OString::valueOf( (double) rDefData.mnHeight / 20.0 ).getStr(), FSEND ); + XML_defaultRowHeight, OString::number( (double) rDefData.mnHeight / 20.0 ).getStr(), FSEND ); rWorksheet->endElement( XML_sheetFormatPr ); maColInfoBfr.SaveXml( rStrm ); diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 37d409097c09..1c35f72f952b 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -56,11 +56,11 @@ void XclExpWindow1::SaveXml( XclExpXmlStream& rStrm ) XML_showSheetTabs, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_WIN1_TABBAR ) ), XML_xWindow, "0", XML_yWindow, "0", - XML_windowWidth, OString::valueOf( (sal_Int32)0x4000 ).getStr(), - XML_windowHeight, OString::valueOf( (sal_Int32)0x2000 ).getStr(), - XML_tabRatio, OString::valueOf( (sal_Int32)mnTabBarSize ).getStr(), - XML_firstSheet, OString::valueOf( (sal_Int32)rTabInfo.GetFirstVisXclTab() ).getStr(), - XML_activeTab, OString::valueOf( (sal_Int32)rTabInfo.GetDisplayedXclTab() ).getStr(), + XML_windowWidth, OString::number( 0x4000 ).getStr(), + XML_windowHeight, OString::number( 0x2000 ).getStr(), + XML_tabRatio, OString::number( mnTabBarSize ).getStr(), + XML_firstSheet, OString::number( rTabInfo.GetFirstVisXclTab() ).getStr(), + XML_activeTab, OString::number( rTabInfo.GetDisplayedXclTab() ).getStr(), // OOXTODO: XML_autoFilterDateGrouping, // bool; AUTOFILTER12? 87Eh FSEND ); } @@ -185,8 +185,8 @@ static const char* lcl_GetActivePane( sal_uInt8 nActivePane ) void XclExpPane::SaveXml( XclExpXmlStream& rStrm ) { rStrm.GetCurrentStream()->singleElement( XML_pane, - XML_xSplit, OString::valueOf( (sal_Int32)mnSplitX ).getStr(), - XML_ySplit, OString::valueOf( (sal_Int32)mnSplitY ).getStr(), + XML_xSplit, OString::number( mnSplitX ).getStr(), + XML_ySplit, OString::number( mnSplitY ).getStr(), XML_topLeftCell, XclXmlUtils::ToOString( maSecondXclPos ).getStr(), XML_activePane, lcl_GetActivePane( mnActivePane ), XML_state, mbFrozenPanes ? "frozen" : "split", @@ -233,7 +233,7 @@ void XclExpSelection::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->singleElement( XML_selection, XML_pane, lcl_GetActivePane( mnPane ), XML_activeCell, XclXmlUtils::ToOString( maSelData.maXclCursor ).getStr(), - XML_activeCellId, OString::valueOf( (sal_Int32) maSelData.mnCursorIdx ).getStr(), + XML_activeCellId, OString::number( maSelData.mnCursorIdx ).getStr(), XML_sqref, XclXmlUtils::ToOString( maSelData.maXclSelection ).getStr(), FSEND ); } @@ -416,7 +416,7 @@ static void lcl_WriteSelection( XclExpXmlStream& rStrm, const XclTabViewData& rD static OString lcl_GetZoom( sal_uInt16 nZoom ) { if( nZoom ) - return OString::valueOf( (sal_Int32)nZoom ); + return OString::number( nZoom ); return OString( "100" ); } @@ -438,7 +438,7 @@ void XclExpTabViewSettings::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_showWhiteSpace, XML_view, maData.mbPageMode ? "pageBreakPreview" : "normal", // OOXTODO: pageLayout XML_topLeftCell, XclXmlUtils::ToOString( maData.maFirstXclPos ).getStr(), - XML_colorId, OString::valueOf( (sal_Int32) rStrm.GetRoot().GetPalette().GetColorIndex( mnGridColorId ) ).getStr(), + XML_colorId, OString::number( rStrm.GetRoot().GetPalette().GetColorIndex( mnGridColorId ) ).getStr(), XML_zoomScale, lcl_GetZoom( maData.mnCurrentZoom ).getStr(), XML_zoomScaleNormal, lcl_GetZoom( maData.mnNormalZoom ).getStr(), // OOXTODO: XML_zoomScaleSheetLayoutView, diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index adeb3d8b7491..0b4fb7445d21 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -2320,10 +2320,10 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const if ( xCtrlModel.is() ) { ScfPropertySet aProps( xCtrlModel ); - OUString sGroupName = OUString::valueOf( static_cast< sal_Int32 >( pLeader->GetDffShapeId() ) ); + OUString sGroupName = OUString::number( pLeader->GetDffShapeId() ); aProps.SetStringProperty( "GroupName", sGroupName ); - aProps.SetStringProperty( "RefValue", OUString::valueOf( nRefVal++ ) ); + aProps.SetStringProperty( "RefValue", OUString::number( nRefVal++ ) ); if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() ) { // propagate cell link info diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 20965db3ace4..0f238a7cf873 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -645,7 +645,7 @@ OUString XclChObjectTable::InsertObject( const Any& rObj ) // create new unused identifier do { - aObjName = maObjNameBase + OUString::valueOf( ++mnIndex ); + aObjName = maObjNameBase + OUString::number( ++mnIndex ); } while( mxContainer->hasByName( aObjName ) ); diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 3538ddec7125..b207769f8587 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -626,7 +626,7 @@ bool XclTools::GetBuiltInStyleId( sal_uInt8& rnStyleId, sal_uInt8& rnLevel, cons { OUString aLevel = rStyleName.copy(nNextChar); sal_Int32 nLevel = aLevel.toInt32(); - if (OUString::valueOf(nLevel) == aLevel && nLevel > 0 && nLevel <= EXC_STYLE_LEVELCOUNT) + if (OUString::number(nLevel) == aLevel && nLevel > 0 && nLevel <= EXC_STYLE_LEVELCOUNT) { rnStyleId = nStyleId; rnLevel = static_cast< sal_uInt8 >( nLevel - 1 ); diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 78241e8a841e..4ebb771a1439 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -221,7 +221,7 @@ void XclExpValueRecord< Type >::SaveXml( XclExpXmlStream& rStrm ) if( mnAttribute == -1 ) return; rStrm.WriteAttributes( - mnAttribute, OString::valueOf( (sal_Int32) maValue ).getStr(), + mnAttribute, OString::number( maValue ).getStr(), FSEND ); } diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 7c864cc63de1..dc879e202855 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -531,7 +531,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S AxCheckBoxModel& rAxModel = aControl.createModel< AxCheckBoxModel >(); convertControlText( rAxModel.maFontData, rAxModel.mnTextColor, rAxModel.maCaption, pTextBox, pClientData->mnTextHAlign ); convertControlBackground( rAxModel, rShape ); - rAxModel.maValue = OUString::valueOf( pClientData->mnChecked ); + rAxModel.maValue = OUString::number( pClientData->mnChecked ); rAxModel.mnSpecialEffect = pClientData->mbNo3D ? AX_SPECIALEFFECT_FLAT : AX_SPECIALEFFECT_SUNKEN; rAxModel.mnVerticalAlign = pClientData->mnTextVAlign; bool bTriState = (pClientData->mnChecked != ::oox::vml::VML_CLIENTDATA_UNCHECKED) && (pClientData->mnChecked != ::oox::vml::VML_CLIENTDATA_CHECKED); @@ -544,7 +544,7 @@ Reference< XShape > VmlDrawing::createAndInsertClientXShape( const ::oox::vml::S AxOptionButtonModel& rAxModel = aControl.createModel< AxOptionButtonModel >(); convertControlText( rAxModel.maFontData, rAxModel.mnTextColor, rAxModel.maCaption, pTextBox, pClientData->mnTextHAlign ); convertControlBackground( rAxModel, rShape ); - rAxModel.maValue = OUString::valueOf( pClientData->mnChecked ); + rAxModel.maValue = OUString::number( pClientData->mnChecked ); rAxModel.mnSpecialEffect = pClientData->mbNo3D ? AX_SPECIALEFFECT_FLAT : AX_SPECIALEFFECT_SUNKEN; rAxModel.mnVerticalAlign = pClientData->mnTextVAlign; } diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index c2639a29e702..ac836c88ac56 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -304,10 +304,10 @@ OUString PivotCacheItem::getName() const { case XML_m: return OUString(); case XML_s: return maValue.get< OUString >(); - case XML_n: return OUString::valueOf( maValue.get< double >() ); // !TODO - case XML_i: return OUString::valueOf( maValue.get< sal_Int32 >() ); + case XML_n: return OUString::number( maValue.get< double >() ); // !TODO + case XML_i: return OUString::number( maValue.get< sal_Int32 >() ); case XML_d: return OUString(); // !TODO - case XML_b: return OUString::valueOf( static_cast< sal_Bool >( maValue.get< bool >() ) ); // !TODO + case XML_b: return OUString::boolean( static_cast< sal_Bool >( maValue.get< bool >() ) ); // !TODO case XML_e: return OUString(); // !TODO } OSL_FAIL( "PivotCacheItem::getName - invalid data type" ); diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index 0ab1395c3af1..14153c03fe0b 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -110,7 +110,7 @@ void ScRTFExport::WriteTab( SCTAB nTab ) void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) { rStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30"; - rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::valueOf(static_cast<sal_Int32>(pDoc->GetRowHeight(nRow, nTab))).getStr(); + rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << OString::number(pDoc->GetRowHeight(nRow, nTab)).getStr(); SCCOL nCol; SCCOL nEndCol = aRange.aEnd.Col(); for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ ) @@ -141,7 +141,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) if ( pChar ) rStrm << pChar; - rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::valueOf(static_cast<sal_Int32>(pCellX[nCol+1])).getStr(); + rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::number(pCellX[nCol+1]).getStr(); if ( (nCol & 0x0F) == 0x0F ) rStrm << sNewLine; // Zeilen nicht zu lang werden lassen } diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index e6a05fb90938..f4d67bc04a4b 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -576,12 +576,12 @@ void XclExpChTrTabId::SaveXml( XclExpXmlStream& rRevisionLogStrm ) sax_fastparser::FSHelperPtr pHeader = rRevisionLogStrm.GetCurrentStream(); pHeader->startElement( XML_sheetIdMap, - XML_count, OString::valueOf( sal_Int32( nTabCount ) ).getStr(), + XML_count, OString::number( nTabCount ).getStr(), FSEND ); for( int i = 0; i < nTabCount; ++i ) { pHeader->singleElement( XML_sheetId, - XML_val, OString::valueOf( sal_Int32( pBuffer[ i ] ) ).getStr(), + XML_val, OString::number( pBuffer[ i ] ).getStr(), FSEND ); } pHeader->endElement( XML_sheetIdMap ); @@ -1006,10 +1006,10 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream& rRevisionLogStrm ) { sax_fastparser::FSHelperPtr pStream = rRevisionLogStrm.GetCurrentStream(); pStream->startElement( XML_rcc, - XML_rId, OString::valueOf( (sal_Int32) GetActionNumber() ).getStr(), + XML_rId, OString::number( GetActionNumber() ).getStr(), XML_ua, XclXmlUtils::ToPsz( GetAccepted () ), // OOXTODO? bAccepted == ua or ra; not sure. XML_ra, NULL, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? - XML_sId, OString::valueOf( (sal_Int32) GetTabId( aPosition.Tab() ) ).getStr(), + XML_sId, OString::number( GetTabId( aPosition.Tab() ) ).getStr(), XML_odxf, NULL, // OOXTODO: not supported XML_xfDxf, NULL, // OOXTODO: not supported XML_s, NULL, // OOXTODO: not supported @@ -1122,10 +1122,10 @@ void XclExpChTrInsert::SaveXml( XclExpXmlStream& rRevisionLogStrm ) { sax_fastparser::FSHelperPtr pStream = rRevisionLogStrm.GetCurrentStream(); pStream->startElement( XML_rrc, - XML_rId, OString::valueOf( (sal_Int32) GetActionNumber() ).getStr(), + XML_rId, OString::number( GetActionNumber() ).getStr(), XML_ua, XclXmlUtils::ToPsz( GetAccepted () ), // OOXTODO? bAccepted == ua or ra; not sure. XML_ra, NULL, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? - XML_sId, OString::valueOf( (sal_Int32) GetTabId( aRange.aStart.Tab() ) ).getStr(), + XML_sId, OString::number( GetTabId( aRange.aStart.Tab() ) ).getStr(), XML_eol, NULL, // OOXTODO: not supported? XML_ref, XclXmlUtils::ToOString( aRange ).getStr(), XML_action, lcl_GetAction( nOpCode ), @@ -1182,12 +1182,12 @@ void XclExpChTrInsertTab::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr pStream = rStrm.GetCurrentStream(); pStream->singleElement( XML_ris, - XML_rId, OString::valueOf( (sal_Int32) GetActionNumber() ).getStr(), + XML_rId, OString::number( GetActionNumber() ).getStr(), XML_ua, XclXmlUtils::ToPsz( GetAccepted () ), // OOXTODO? bAccepted == ua or ra; not sure. XML_ra, NULL, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? - XML_sheetId, OString::valueOf( (sal_Int32) GetTabId( nTab ) ).getStr(), + XML_sheetId, OString::number( GetTabId( nTab ) ).getStr(), XML_name, XclXmlUtils::ToOString( GetTabInfo().GetScTabName( nTab ) ).getStr(), - XML_sheetPosition, OString::valueOf( (sal_Int32) nTab ).getStr(), + XML_sheetPosition, OString::number( nTab ).getStr(), FSEND ); } @@ -1252,13 +1252,13 @@ void XclExpChTrMoveRange::SaveXml( XclExpXmlStream& rRevisionLogStrm ) sax_fastparser::FSHelperPtr pStream = rRevisionLogStrm.GetCurrentStream(); pStream->startElement( XML_rm, - XML_rId, OString::valueOf( (sal_Int32) GetActionNumber() ).getStr(), + XML_rId, OString::number( GetActionNumber() ).getStr(), XML_ua, XclXmlUtils::ToPsz( GetAccepted () ), // OOXTODO? bAccepted == ua or ra; not sure. XML_ra, NULL, // OOXTODO: RRD.fUndoAction? Or RRD.fAccepted? - XML_sheetId, OString::valueOf( (sal_Int32) GetTabId( aDestRange.aStart.Tab() ) ).getStr(), + XML_sheetId, OString::number( GetTabId( aDestRange.aStart.Tab() ) ).getStr(), XML_source, XclXmlUtils::ToOString( aSourceRange ).getStr(), XML_destination, XclXmlUtils::ToOString( aDestRange ).getStr(), - XML_sourceSheetId, OString::valueOf( (sal_Int32) GetTabId( aSourceRange.aStart.Tab() ) ).getStr(), + XML_sourceSheetId, OString::number( GetTabId( aSourceRange.aStart.Tab() ) ).getStr(), FSEND ); // OOXTODO: does this handle XML_rfmt, XML_undo? XclExpChTrAction* pAction = GetAddAction(); @@ -1306,7 +1306,7 @@ void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr pStream = rStrm.GetCurrentStream(); pStream->startElement( XML_rfmt, - XML_sheetId, OString::valueOf( (sal_Int32) GetTabId( aRange.aStart.Tab() ) ).getStr(), + XML_sheetId, OString::number( GetTabId( aRange.aStart.Tab() ) ).getStr(), XML_xfDxf, NULL, // OOXTODO: not supported XML_s, NULL, // OOXTODO: style XML_sqref, XclXmlUtils::ToOString( aRange ).getStr(), diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index dcd62b5b5ab5..c5821e0157e7 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1120,7 +1120,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->singleElement( XML_sheet, XML_name, XclXmlUtils::ToOString( sUnicodeName ).getStr(), - XML_sheetId, OString::valueOf( (sal_Int32)( nTab+1 ) ).getStr(), + XML_sheetId, OString::number( ( nTab+1 ) ).getStr(), XML_state, nGrbit == 0x0000 ? "visible" : "hidden", FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), FSEND ); @@ -1317,7 +1317,7 @@ void ExcEScenario::SaveXml( XclExpXmlStream& rStrm ) XML_name, XclXmlUtils::ToOString( sName ).getStr(), XML_locked, XclXmlUtils::ToPsz( nProtected ), // OOXTODO: XML_hidden, - XML_count, OString::valueOf( (sal_Int32) aCells.size() ).getStr(), + XML_count, OString::number( aCells.size() ).getStr(), XML_user, XESTRING_TO_PSZ( sUserName ), XML_comment, XESTRING_TO_PSZ( sComment ), FSEND ); @@ -1384,8 +1384,8 @@ void ExcEScenarioManager::SaveXml( XclExpXmlStream& rStrm ) sax_fastparser::FSHelperPtr& rWorkbook = rStrm.GetCurrentStream(); rWorkbook->startElement( XML_scenarios, - XML_current, OString::valueOf( (sal_Int32)nActive ).getStr(), - XML_show, OString::valueOf( (sal_Int32)nActive ).getStr(), + XML_current, OString::number( nActive ).getStr(), + XML_show, OString::number( nActive ).getStr(), // OOXTODO: XML_sqref, FSEND ); @@ -1504,7 +1504,7 @@ sal_Size XclCalccount::GetLen() const void XclCalccount::SaveXml( XclExpXmlStream& rStrm ) { rStrm.WriteAttributes( - XML_iterateCount, OString::valueOf( (sal_Int32)nCount ).getStr(), + XML_iterateCount, OString::number( nCount ).getStr(), FSEND ); } @@ -1573,7 +1573,7 @@ sal_Size XclDelta::GetLen() const void XclDelta::SaveXml( XclExpXmlStream& rStrm ) { rStrm.WriteAttributes( - XML_iterateDelta, OString::valueOf( fDelta ).getStr(), + XML_iterateDelta, OString::number( fDelta ).getStr(), FSEND ); } diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 7d7030af8c9f..c9b9b3b13d5f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -108,7 +108,7 @@ OUString ScXMLExportDataPilot::getDPOperatorXML( void ScXMLExportDataPilot::WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions) { - rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(sal_Int32(aQueryEntry.nField))); + rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(aQueryEntry.nField)); if (bIsCaseSensitive) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); const ScQueryEntry::Item& rItem = aQueryEntry.GetQueryItem(); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 4fa8b2ad491d..8336e497ddec 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -339,7 +339,7 @@ private: { // Convert field value from absolute to relative. SCCOLROW nField = aParam.maKeyState[i].nField - nFieldStart; - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(nField)); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(nField)); if (!aParam.maKeyState[i].bAscending) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING); @@ -431,7 +431,7 @@ private: void writeCondition(const ScQueryEntry& rEntry, SCCOLROW nFieldStart, bool bCaseSens, bool bRegExp) { - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(rEntry.nField - nFieldStart)); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(rEntry.nField - nFieldStart)); if (bCaseSens) mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); @@ -653,7 +653,7 @@ private: break; sal_Int32 nFieldCol = static_cast<sal_Int32>(aParam.nField[i]); - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, OUString::valueOf(nFieldCol)); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, OUString::number(nFieldCol)); SvXMLElementExport aElemSTR(mrExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true); for (SCCOL j = 0, n = aParam.nSubTotals[i]; j < n; ++j) @@ -661,7 +661,7 @@ private: sal_Int32 nCol = static_cast<sal_Int32>(aParam.pSubTotals[i][j]); ScSubTotalFunc eFunc = aParam.pFunctions[i][j]; - mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::valueOf(nCol)); + mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, OUString::number(nCol)); OUString aFuncStr; ScXMLConverter::GetStringFromFunction(aFuncStr, eFunc); mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, aFuncStr); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 882948dbce9a..a9d59ad1b12c 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -162,7 +162,7 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, else { sal_Int32 nNameIndex(nCount + 1); - OUString sCount(OUString::valueOf(nNameIndex)); + OUString sCount(OUString::number(nNameIndex)); OUString sPrefix("val"); aValidation.sName += sPrefix; aValidation.sName += sCount; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 541924cc513d..8d12427e75ef 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3346,7 +3346,7 @@ void ScXMLExport::SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgres if (nEqualCellCount > 0) { sal_Int32 nTemp(nEqualCellCount + 1); - OUString sOUEqualCellCount(OUString::valueOf(nTemp)); + OUString sOUEqualCellCount(OUString::number(nTemp)); AddAttribute(sAttrColumnsRepeated, sOUEqualCellCount); if (bIncProgress) IncrementProgressBar(sal_False, nEqualCellCount); @@ -4024,7 +4024,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(it->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it)); OUStringBuffer aBuffer; @@ -4085,7 +4085,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpLowerLimit->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(pFormatData->mpLowerLimit->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpLowerLimit, true)); SvXMLElementExport aElementDataBarEntryLower(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); } @@ -4097,7 +4097,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(pFormatData->mpUpperLimit->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(pFormatData->mpUpperLimit->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*pFormatData->mpUpperLimit, false)); SvXMLElementExport aElementDataBarEntryUpper(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); } @@ -4119,7 +4119,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab) AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, sFormula); } else - AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::valueOf(it->GetValue())); + AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE, OUString::number(it->GetValue())); AddAttribute(XML_NAMESPACE_CALC_EXT, XML_TYPE, getCondFormatEntryType(*it)); SvXMLElementExport aElementColorScaleEntry(*this, XML_NAMESPACE_CALC_EXT, XML_FORMATTING_ENTRY, true, true); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index c1bbd3a0592b..1e39316f101f 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2661,7 +2661,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const OUString& r OUString sErrorMessage("Fehler im Formatstring "); sErrorMessage += sFormatString; sErrorMessage += OUString(" an Position "); - sErrorMessage += OUString::valueOf(rException.CheckPos); + sErrorMessage += OUString::number(rException.CheckPos); uno::Sequence<OUString> aSeq(1); aSeq[0] = sErrorMessage; uno::Reference<xml::sax::XLocator> xLocator; diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index ac0749b9101a..4801a6d235b0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1932,7 +1932,7 @@ OUString SAL_CALL IsObjectValid(); OUString sName = String(ScResId(STR_ACC_DOC_NAME)); sal_Int32 nNumber(sal_Int32(meSplitPos) + 1); - sName += OUString::valueOf(nNumber); + sName += OUString::number(nNumber); return sName; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 12315f148b96..216d7171787d 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -387,7 +387,7 @@ OUString SAL_CALL ScAccessiblePreviewHeaderCell::createAccessibleName() throw(un else { // name of row header - sName += OUString::valueOf( (sal_Int32) ( maCellPos.Row() + 1 ) ); + sName += OUString::number( ( maCellPos.Row() + 1 ) ); } return sName; diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 5d6e2181817f..94bb5a67111a 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -69,7 +69,7 @@ void ScTbxInsertCtrl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eState, nLastSlotId = pItem->GetValue(); sal_uInt16 nImageId = nLastSlotId ? nLastSlotId : GetSlotId(); OUString aSlotURL( "slot:" ); - aSlotURL += OUString::valueOf( sal_Int32( nImageId )); + aSlotURL += OUString::number( nImageId); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 581da4846aea..9c8e57e149ae 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -53,7 +53,7 @@ void SetValue( ScColorScaleEntry* pEntry, Edit& aEdit) if(pEntry->GetType() == COLORSCALE_FORMULA) aEdit.SetText(pEntry->GetFormula(formula::FormulaGrammar::GRAM_DEFAULT)); else if(pEntry->GetType() != COLORSCALE_MIN && pEntry->GetType() != COLORSCALE_MAX) - aEdit.SetText(OUString::valueOf(pEntry->GetValue())); + aEdit.SetText(OUString::number(pEntry->GetValue())); else aEdit.Disable(); } diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 2fb93e08a136..ee1fd1873bff 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -66,7 +66,7 @@ void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) { mnIndex = nIndex; OUStringBuffer aBuffer(maStrCondition); - aBuffer.append(OUString::valueOf(nIndex)); + aBuffer.append(OUString::number(nIndex)); maFtCondNr.SetText(aBuffer.makeStringAndClear()); } diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 5c1b7a64e698..c28843a99aec 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2900,7 +2900,7 @@ void VBA_InsertModule( ScDocument& rDoc, SCTAB nTab, const OUString& sModuleName nNum = 1; } while( xLib->hasByName( genModuleName ) ) - genModuleName = OUString( "Sheet") + OUString::valueOf( ++nNum ); + genModuleName = OUString( "Sheet") + OUString::number( ++nNum ); uno::Any aSourceAny; OUString sTmpSource = sSource; diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 7ad46023b492..12edd679a729 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -307,7 +307,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) // adding a second copy to sc (see ScTbxInsertCtrl::StateChanged) OUString aSlotURL( "slot:" ); - aSlotURL += OUString::valueOf( sal_Int32( SID_DEL_ROWS ) ); + aSlotURL += OUString::number( SID_DEL_ROWS ); uno::Reference<frame::XFrame> xFrame = GetBindings().GetActiveFrame(); Image aDelNm = ::GetImage( xFrame, aSlotURL, false ); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index c7c45cbeaa24..fa7885d687f3 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -99,7 +99,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true ); else - sTxt += OUString::valueOf(mnIntValue); + sTxt += OUString::number(mnIntValue); rDev.SetFont( aFont ); rDev.DrawText( aNewPos, sTxt ); diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 6b38aee605ee..51aa29aa585c 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -425,7 +425,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeExce static OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) { OUString aRet( "Entry" ); - aRet += OUString::valueOf( nIndex ); + aRet += OUString::number( nIndex ); return aRet; } diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 449b9d744ad1..700ecc20a7b2 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -633,7 +633,7 @@ ScVbaChart::getDefaultSeriesDescriptions( sal_Int32 _nCount ) sal_Int32 nLen = sDescriptions.getLength(); for (sal_Int32 i = 0; i < nLen; i++) { - sDescriptions[i] = DEFAULTSERIESPREFIX + OUString::valueOf(i+1); + sDescriptions[i] = DEFAULTSERIESPREFIX + OUString::number(i+1); } return sDescriptions; } diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index 9af64aab38f2..cba17fa227fe 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -396,9 +396,9 @@ void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& C if (( nFrom || nTo ) ) { if ( nFrom ) - sRange = OUString::valueOf( nFrom ) + sRange; + sRange = OUString::number( nFrom ) + sRange; if ( nTo ) - sRange += OUString::valueOf( nTo ); + sRange += OUString::number( nTo ); } if ( PrToFileName.getValue() ) @@ -479,7 +479,7 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti { sal_Bool bBool = false; pvargItem >>= bBool; - sString = OUString::valueOf( bBool ); + sString = OUString::boolean( bBool ); break; } case uno::TypeClass_STRING: @@ -489,14 +489,14 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti { float aFloat = 0; pvargItem >>= aFloat; - sString = OUString::valueOf( aFloat ); + sString = OUString::number( aFloat ); break; } case uno::TypeClass_DOUBLE: { double aDouble = 0; pvargItem >>= aDouble; - sString = OUString::valueOf( aDouble ); + sString = OUString::number( aDouble ); break; } case uno::TypeClass_SHORT: @@ -505,7 +505,7 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti { sal_Int32 aNum = 0; pvargItem >>= aNum; - sString = OUString::valueOf( aNum ); + sString = OUString::number( aNum ); break; } @@ -513,7 +513,7 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti { sal_Int64 aHyper = 0; pvargItem >>= aHyper; - sString = OUString::valueOf( aHyper ); + sString = OUString::number( aHyper ); break; } default: @@ -548,7 +548,7 @@ ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, cons return scompname; } } - scompname = _sElementName + _sSuffixSeparator + OUString::valueOf( a++ ); + scompname = _sElementName + _sSuffixSeparator + OUString::number( a++ ); } return OUString(); } diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 840c7956ad67..f0c1f097e6b0 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -267,7 +267,7 @@ ScVbaInterior::SetAttributeData( sal_Int32 nValue ) { xml::AttributeData aAttributeData; aAttributeData.Type = OUString( "sal_Int32" ); - aAttributeData.Value = OUString::valueOf( nValue ); + aAttributeData.Value = OUString::number( nValue ); return uno::makeAny( aAttributeData ); } uno::Any diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index a0a88e870ccc..af8bf07e12cb 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -3166,11 +3166,11 @@ ScVbaRange::Find( const uno::Any& What, const uno::Any& After, const uno::Any& L } else if( What >>= nWhat ) { - sWhat = OUString::valueOf( nWhat ); + sWhat = OUString::number( nWhat ); } else if( What >>= fWhat ) { - sWhat = OUString::valueOf( fWhat ); + sWhat = OUString::number( fWhat ); } else throw uno::RuntimeException("Range::Find, missing params", uno::Reference< uno::XInterface >() ); diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 5c5d4c96e0a5..b2f49a819eca 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -342,7 +342,7 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ getCurrentDelim() = nDelim; //set new current - sFormat = OUString::valueOf( (sal_Int32)nDelim ) + sRestOfFormat; + sFormat = OUString::number( nDelim ) + sRestOfFormat; sProps[ nIndex++ ].Value <<= sFormat; sProps[ nIndex ].Name = OUString("FilterName"); sProps[ nIndex++ ].Value <<= OUString( "Text - txt - csv (StarCalc)" ); |