[Libreoffice-commits] core.git: basctl/source chart2/qa chart2/source comphelper/source connectivity/source cui/source dbaccess/source filter/source framework/source lotuswordpro/source oox/source sc/source sdext/source sd/source sfx2/source starmath/source svl/source svx/source sw/source toolkit/source tools/source ucbhelper/source ucb/source vcl/source writerfilter/source xmloff/source xmlsecurity/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 22 19:42:55 UTC 2021
basctl/source/basicide/baside2b.cxx | 4 -
chart2/qa/extras/chart2dump/chart2dump.cxx | 2
chart2/source/tools/ObjectIdentifier.cxx | 14 ++---
comphelper/source/misc/mimeconfighelper.cxx | 2
connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx | 2
cui/source/options/optaboutconfig.cxx | 8 +-
dbaccess/source/filter/hsqldb/fbalterparser.cxx | 2
dbaccess/source/filter/hsqldb/fbcreateparser.cxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
filter/source/svg/svgwriter.cxx | 14 ++---
framework/source/fwe/classes/addonsoptions.cxx | 2
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 2
lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx | 2
lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx | 2
oox/source/dump/dumperbase.cxx | 2
sc/source/core/tool/address.cxx | 2
sc/source/core/tool/compiler.cxx | 10 +--
sc/source/filter/excel/xehelper.cxx | 2
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/dbgui/asciiopt.cxx | 12 ++--
sc/source/ui/dbgui/csvruler.cxx | 2
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 4 -
sc/source/ui/unoobj/filtuno.cxx | 2
sc/source/ui/view/cellsh3.cxx | 4 -
sd/source/filter/html/htmlex.cxx | 12 ++--
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 12 ++--
sd/source/ui/view/DocumentRenderer.cxx | 2
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 6 +-
sdext/source/presenter/PresenterToolBar.cxx | 2
sfx2/source/appl/newhelp.cxx | 4 -
sfx2/source/control/unoctitm.cxx | 11 ++-
sfx2/source/view/lokhelper.cxx | 2
starmath/source/mathml/mathmlexport.cxx | 2
starmath/source/mathtype.cxx | 4 -
svl/source/numbers/zforlist.cxx | 2
svl/source/passwordcontainer/passwordcontainer.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 10 +--
svx/source/table/accessiblecell.cxx | 2
sw/source/core/doc/number.cxx | 2
sw/source/core/fields/cellfml.cxx | 12 ++--
sw/source/filter/html/css1atr.cxx | 4 -
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 2
sw/source/uibase/config/modcfg.cxx | 2
sw/source/uibase/uiview/pview.cxx | 4 -
sw/source/uibase/uno/unotxdoc.cxx | 2
toolkit/source/awt/vclxprinter.cxx | 2
tools/source/debug/debug.cxx | 28 +++++-----
tools/source/fsys/urlobj.cxx | 2
ucb/source/ucp/tdoc/tdoc_content.cxx | 4 -
ucb/source/ucp/webdav-neon/NeonUri.cxx | 4 -
ucb/source/ucp/webdav/SerfUri.cxx | 4 -
ucbhelper/source/client/proxydecider.cxx | 2
vcl/source/gdi/mtfxmldump.cxx | 2
vcl/source/gdi/pdfobjectcopier.cxx | 6 --
vcl/source/uitest/logger.cxx | 4 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
xmloff/source/draw/animationexport.cxx | 2
xmloff/source/draw/shapeexport.cxx | 6 +-
xmloff/source/forms/propertyexport.cxx | 2
xmloff/source/style/impastpl.cxx | 8 +-
xmloff/source/style/xmlbahdl.cxx | 6 +-
xmloff/source/xforms/xformsexport.cxx | 6 +-
xmlsecurity/source/framework/buffernode.cxx | 4 -
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 4 -
65 files changed, 150 insertions(+), 153 deletions(-)
New commits:
commit 75997f13ee3a71d6c994392264b0190bd7bb6756
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Apr 21 13:48:45 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Apr 22 21:42:14 2021 +0200
no need to create temporaries when appending number to O[U]StringBuffer
Change-Id: I36d82423b5f75010552696a66cec7e53ee265ce4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114395
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index f2ace93d299c..cdc69b96b355 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2142,10 +2142,10 @@ IMPL_LINK(WatchWindow, RequestingChildrenHdl, const weld::TreeIter&, rParent, bo
for (j = 0; j < nParentLevel; j++)
{
sal_Int32 n = pChildItem->vIndices[j] = pItem->vIndices[j];
- aIndexStr.append(OUString::number(n)).append(",");
+ aIndexStr.append(n).append(",");
}
pChildItem->vIndices[nParentLevel] = i;
- aIndexStr.append(OUString::number(i)).append(")");
+ aIndexStr.append(i).append(")");
OUString aDisplayName;
WatchItem* pArrayRootItem = pChildItem->GetRootItem();
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 838234f7c78c..2ec7ba6f9bcb 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -240,7 +240,7 @@ protected:
OUStringBuffer aBuffer;
for (const double& vectorItem : rVector)
{
- aBuffer.append(OUString::number(vectorItem)).append(";");
+ aBuffer.append(vectorItem).append(";");
}
return aBuffer.makeStringAndClear();
}
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 64273763158e..608f4337a53e 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -525,7 +525,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
{
aRet = ObjectIdentifier::createParticleForDiagram();
aRet.append(":CS=");
- aRet.append( OUString::number( nCooSysIndex ) );
+ aRet.append( nCooSysIndex );
break;
}
}
@@ -553,7 +553,7 @@ OUString ObjectIdentifier::createParticleForCoordinateSystem(
{
aRet = ObjectIdentifier::createParticleForDiagram();
aRet.append(":CS=");
- aRet.append( OUString::number( nCooSysIndex ) );
+ aRet.append( nCooSysIndex );
break;
}
}
@@ -607,15 +607,15 @@ OUString ObjectIdentifier::createParticleForSeries(
OUStringBuffer aRet;
aRet.append("D=");
- aRet.append( OUString::number( nDiagramIndex ) );
+ aRet.append( nDiagramIndex );
aRet.append(":CS=");
- aRet.append( OUString::number( nCooSysIndex ) );
+ aRet.append( nCooSysIndex );
aRet.append(":CT=");
- aRet.append( OUString::number( nChartTypeIndex ) );
+ aRet.append( nChartTypeIndex );
aRet.append(":");
aRet.append(getStringForType( OBJECTTYPE_DATA_SERIES ));
aRet.append("=");
- aRet.append( OUString::number( nSeriesIndex ) );
+ aRet.append( nSeriesIndex );
return aRet.makeStringAndClear();
}
@@ -1101,7 +1101,7 @@ OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType,
if( !aRet.isEmpty() )
{
aRet.append("=");
- aRet.append(OUString::number(nIndex));
+ aRet.append(nIndex);
}
return aRet.makeStringAndClear();
}
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 73adf6918baf..5069105dc1a1 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -60,7 +60,7 @@ OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Seq
sal_Int32 nDigit1 = static_cast<sal_Int32>( static_cast<sal_uInt8>(aClassID[nInd]) / 16 );
sal_Int32 nDigit2 = static_cast<sal_uInt8>(aClassID[nInd]) % 16;
- aResult.append(OUString::number( nDigit1, 16 )).append(OUString::number( nDigit2, 16 ));
+ aResult.append( nDigit1, 16 ).append( nDigit2, 16 );
}
}
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
index ab9c2fb39992..124a606a8f9e 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx
@@ -81,7 +81,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
// MYSQL_FIELD::charsetnr is the collation identifier
// _ci postfix means it's insensitive
OUStringBuffer sql{ "SHOW COLLATION WHERE Id =" };
- sql.append(OUString::number(m_fields.at(column - 1).charsetNumber));
+ sql.append(static_cast<sal_Int32>(m_fields.at(column - 1).charsetNumber));
Reference<XStatement> stmt = m_rConnection.createStatement();
Reference<XResultSet> rs = stmt->executeQuery(sql.makeStringAndClear());
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 6a15fb3a1411..26e47983f541 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -395,7 +395,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
sValue.append(",");
}
- sValue.append(OUString::number( seq[j] ));
+ sValue.append( static_cast<sal_Int32>(seq[j]) );
}
}
else if( sType == "[]long" )
@@ -407,7 +407,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
sValue.append(",");
}
- sValue.append(OUString::number( seq[j] ));
+ sValue.append( seq[j] );
}
}
else if( sType == "[]hyper" )
@@ -419,7 +419,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
sValue.append(",");
}
- sValue.append(OUString::number( seq[j] ));
+ sValue.append( seq[j] );
}
}
else if( sType == "[]double" )
@@ -431,7 +431,7 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces
{
sValue.append(",");
}
- sValue.append(OUString::number( seq[j] ));
+ sValue.append( seq[j] );
}
}
else if( sType == "[]string" )
diff --git a/dbaccess/source/filter/hsqldb/fbalterparser.cxx b/dbaccess/source/filter/hsqldb/fbalterparser.cxx
index 818673cbdaf3..024598c0b319 100644
--- a/dbaccess/source/filter/hsqldb/fbalterparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbalterparser.cxx
@@ -43,7 +43,7 @@ OUString FbAlterStmtParser::compose() const
sSql.append(" RESTART WITH ");
// Firebird: restart with 0 means the first number is 1, not 0.
- sSql.append(OUString::number(getIdentityParam() - 1));
+ sSql.append(getIdentityParam() - 1);
return sSql.makeStringAndClear();
}
diff --git a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
index 8ee1196a1618..f3399474c272 100644
--- a/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
+++ b/dbaccess/source/filter/hsqldb/fbcreateparser.cxx
@@ -163,7 +163,7 @@ OUString FbCreateStmtParser::compose() const
auto it = params.cbegin();
while (it != params.end())
{
- sSql.append(OUString::number(*it));
+ sSql.append(*it);
++it;
if (it != params.end())
sSql.append(",");
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 693c11be0fd7..22408bbc58aa 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2813,7 +2813,7 @@ OUString OQueryDesignView::getStatement()
const sal_Int64 nLimit = rController.getLimit();
if( nLimit != -1 )
{
- aSqlCmd.append( " LIMIT " ).append( OUString::number(nLimit) );
+ aSqlCmd.append( " LIMIT " ).append(nLimit);
}
}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index f3645d1bd81f..dded11e4b86f 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1883,9 +1883,9 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
{
aPolyPoint = rPoly[ 0 ];
aPathData.append("M ")
- .append(OUString::number( aPolyPoint.X() ))
+ .append( aPolyPoint.X() )
.append(aComma)
- .append(OUString::number( aPolyPoint.Y() ));
+ .append( aPolyPoint.Y() );
char nCurrentMode = 0;
const bool bClose(!bLine || rPoly[0] == rPoly[nSize - 1]);
@@ -1906,9 +1906,9 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
aPathData.append(aBlank);
aPolyPoint = rPoly[ n++ ];
- aPathData.append(OUString::number( aPolyPoint.X() ))
+ aPathData.append( aPolyPoint.X() )
.append(aComma)
- .append(OUString::number( aPolyPoint.Y() ));
+ .append( aPolyPoint.Y() );
}
}
else
@@ -1920,9 +1920,9 @@ OUString SVGActionWriter::GetPathString( const tools::PolyPolygon& rPolyPoly, bo
}
aPolyPoint = rPoly[ n++ ];
- aPathData.append(OUString::number( aPolyPoint.X() ))
+ aPathData.append( aPolyPoint.X() )
.append(aComma)
- .append(OUString::number( aPolyPoint.Y() ));
+ .append( aPolyPoint.Y() );
}
}
@@ -2167,7 +2167,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape )
if( k )
aDashArrayStr.append(",");
- aDashArrayStr.append(OUString::number( nDash ));
+ aDashArrayStr.append( nDash );
}
mrExport.AddAttribute( XML_NAMESPACE_NONE, "stroke-dasharray", aDashArrayStr.makeStringAndClear() );
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 47012261969e..93076e20d707 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -927,7 +927,7 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
OUString aPopupMenuURL;
OUStringBuffer aBuf( m_aRootAddonPopupMenuURLPrexfix.getLength() + 3 );
aBuf.append( m_aRootAddonPopupMenuURLPrexfix );
- aBuf.append( OUString::number( ++m_nRootAddonPopupMenuId ));
+ aBuf.append( ++m_nRootAddonPopupMenuId );
aPopupMenuURL = aBuf.makeStringAndClear();
return aPopupMenuURL;
}
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
index a356ea5ef56e..fdc6b1113e97 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.cxx
@@ -72,7 +72,7 @@ OUString XFSvgPathEntry::ToString()
for (auto const& point : m_aPoints)
{
- str.append(OUString::number(point.GetX()*1000)).append(" ").append(OUString::number(point.GetY()*1000)).append(" ");
+ str.append(point.GetX()*1000).append(" ").append(point.GetY()*1000).append(" ");
}
str.stripEnd(' ');
return str.makeStringAndClear();
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
index c499f8800525..d37e4f8a5848 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx
@@ -83,7 +83,7 @@ void XFDrawPolygon::ToXml(IXFStream *pStrm)
{
double x = (point.GetX()-rect.GetX())*1000;
double y = (point.GetY()-rect.GetY())*1000;
- strPoints.append(OUString::number(x)).append(" ").append(OUString::number(y)).append(" ");
+ strPoints.append(x).append(" ").append(y).append(" ");
}
strPoints.stripEnd(' ');
pAttrList->AddAttribute( "draw:points", strPoints.makeStringAndClear());
diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
index ed1ec06915c8..7a9bcdcad32a 100644
--- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx
@@ -83,7 +83,7 @@ void XFDrawPolyline::ToXml(IXFStream *pStrm)
{
double x = (point.GetX()-rect.GetX())*1000;
double y = (point.GetY()-rect.GetY())*1000;
- strPoints.append(OUString::number(x)).append(",").append(OUString::number(y)).append(" ");
+ strPoints.append(x).append(",").append(y).append(" ");
}
strPoints.stripEnd(' ');
pAttrList->AddAttribute( "draw:points", strPoints.makeStringAndClear());
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index c3b26de7a067..b73c24accef0 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -243,7 +243,7 @@ void StringHelper::appendDec( OUStringBuffer& rStr, sal_uInt64 nData, sal_Int32
will be written separately. */
OUStringBuffer aBuffer;
if( nData > 9 )
- aBuffer.append( OUString::number( nData / 10 ) );
+ aBuffer.append( static_cast<sal_Int64>(nData / 10 ) );
aBuffer.append( static_cast< sal_Unicode >( '0' + (nData % 10) ) );
appendString( rStr, aBuffer.makeStringAndClear(), nWidth, cFill );
}
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index fb086018a972..06ffd08c7d44 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -2505,7 +2505,7 @@ OUString ScAddress::GetColRowString() const
case formula::FormulaGrammar::CONV_XL_A1:
case formula::FormulaGrammar::CONV_XL_OOX:
lcl_ScColToAlpha( aString, nCol);
- aString.append(OUString::number(nRow+1));
+ aString.append(nRow+1);
break;
case formula::FormulaGrammar::CONV_XL_R1C1:
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 1ee6b9ec9592..233038b90c24 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1602,7 +1602,7 @@ struct ConventionXL_OOX : public ConventionXL_A1
static void makeExternalDocStr( OUStringBuffer& rBuffer, sal_uInt16 nFileId )
{
- rBuffer.append('[').append( OUString::number( nFileId+1)).append(']');
+ rBuffer.append('[').append( static_cast<sal_Int32>(nFileId+1) ).append(']');
}
};
@@ -1616,10 +1616,10 @@ r1c1_add_col( OUStringBuffer &rBuf, const ScSingleRefData& rRef, const ScAddress
{
SCCOL nCol = rRef.Col();
if (nCol != 0)
- rBuf.append("[").append(OUString::number(nCol)).append("]");
+ rBuf.append("[").append(static_cast<sal_Int32>(nCol)).append("]");
}
else
- rBuf.append( OUString::number( rAbsRef.Col() + 1 ) );
+ rBuf.append( static_cast<sal_Int32>(rAbsRef.Col() + 1) );
}
static void
r1c1_add_row( OUStringBuffer &rBuf, const ScSingleRefData& rRef, const ScAddress& rAbsRef )
@@ -1629,11 +1629,11 @@ r1c1_add_row( OUStringBuffer &rBuf, const ScSingleRefData& rRef, const ScAddress
{
if (rRef.Row() != 0)
{
- rBuf.append("[").append( OUString::number(rRef.Row()) ).append("]");
+ rBuf.append("[").append(rRef.Row() ).append("]");
}
}
else
- rBuf.append( OUString::number( rAbsRef.Row() + 1 ) );
+ rBuf.append( rAbsRef.Row() + 1 );
}
namespace {
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index 3c3b2834e0db..d7b769e2c811 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -760,7 +760,7 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico
aNewData.mnHeight = (aNewData.mnHeight + 10) / 20;
bool bFontHtChanged = (aFontData.mnHeight != aNewData.mnHeight);
if( bFontHtChanged )
- aParaText.append("&").append(OUString::number( aNewData.mnHeight ));
+ aParaText.append("&").append( static_cast<sal_Int32>(aNewData.mnHeight) );
// update maximum paragraph height, convert to twips
nParaHeight = ::std::max< sal_Int32 >( nParaHeight, aNewData.mnHeight * 20 );
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 063909501f1b..168334f5cce9 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1381,7 +1381,7 @@ void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & rFuncStrVec
{
aPayload.append("{");
aPayload.append("\"index\": ");
- aPayload.append(OString::number(nCurIndex));
+ aPayload.append(static_cast<sal_Int64>(nCurIndex));
aPayload.append(", ");
aPayload.append("\"signature\": \"");
aPayload.append(escapeJSON(ppFDesc->getSignature()));
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index d2082706d917..5dcb1cbd251f 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -192,7 +192,7 @@ OUString ScAsciiOptions::WriteToString() const
{
if (i)
aOutStr.append("/");
- aOutStr.append(OUString::number(aFieldSeps[i]));
+ aOutStr.append(aFieldSeps[i]);
}
if ( bMergeFieldSeps )
{
@@ -202,7 +202,7 @@ OUString ScAsciiOptions::WriteToString() const
}
// Token 1: Text Quote character.
- aOutStr.append(",").append(OUString::number(cTextSep)).append(",");
+ aOutStr.append(",").append(cTextSep).append(",");
//Token 2: Text encoding.
if ( bCharSetSystem ) // force "SYSTEM"
@@ -211,16 +211,16 @@ OUString ScAsciiOptions::WriteToString() const
aOutStr.append(ScGlobal::GetCharsetString( eCharSet ));
//Token 3: Number of start row.
- aOutStr.append(",").append(OUString::number(nStartRow)).append(",");
+ aOutStr.append(",").append(nStartRow).append(",");
//Token 4: Column info.
for (size_t nInfo=0; nInfo<mvColStart.size(); nInfo++)
{
if (nInfo)
aOutStr.append("/");
- aOutStr.append(OUString::number(mvColStart[nInfo]))
+ aOutStr.append(mvColStart[nInfo])
.append("/")
- .append(OUString::number(mvColFormat[nInfo]));
+ .append(static_cast<sal_Int32>(mvColFormat[nInfo]));
}
// #i112025# the options string is used in macros and linked sheets,
@@ -228,7 +228,7 @@ OUString ScAsciiOptions::WriteToString() const
aOutStr.append(",")
//Token 5: Language
- .append(OUString::number(static_cast<sal_uInt16>(eLang))).append(",")
+ .append(static_cast<sal_Int32>(static_cast<sal_uInt16>(eLang))).append(",")
//Token 6: Import quoted field as text.
.append(OUString::boolean( bQuotedFieldAsText )).append(",")
//Token 7: Detect special numbers.
diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx
index 3b8a1a808399..7259b9e44add 100644
--- a/sc/source/ui/dbgui/csvruler.cxx
+++ b/sc/source/ui/dbgui/csvruler.cxx
@@ -73,7 +73,7 @@ static void save_FixedWidthList(const ScCsvSplits& rSplits)
sal_uInt32 n = rSplits.Count();
for (sal_uInt32 i = 0; i < n; ++i)
{
- sSplits.append(OUString::number(rSplits[i]));
+ sSplits.append(rSplits[i]);
sSplits.append(";");
}
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 0ceee8cee473..fe8809f144e1 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -298,10 +298,10 @@ ScMergeColumnTransformationControl::ScMergeColumnTransformationControl(
OUStringBuffer aBuffer;
// map from zero based to one based column numbers
- aBuffer.append(OUString::number(nStartCol + 1));
+ aBuffer.append(static_cast<sal_Int32>(nStartCol + 1));
for ( SCCOL nCol = nStartCol + 1; nCol <= nEndCol; ++nCol)
{
- aBuffer.append(";").append(OUString::number(nCol + 1));
+ aBuffer.append(";").append(static_cast<sal_Int32>(nCol + 1));
}
mxEdColumns->set_text(aBuffer.makeStringAndClear());
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 20701fdea1df..1e6119ecb36d 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -213,7 +213,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute()
LanguageType eLang = pDlg->GetLanguageType();
OUStringBuffer aBuf;
- aBuf.append(OUString::number(static_cast<sal_uInt16>(eLang)));
+ aBuf.append(static_cast<sal_Int32>(static_cast<sal_uInt16>(eLang)));
aBuf.append(' ');
aBuf.append(pDlg->IsDateConversionSet() ? u'1' : u'0');
aFilterOptions = aBuf.makeStringAndClear();
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 433ce133997d..b98440d9e552 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -125,10 +125,10 @@ void lcl_lokGetWholeFunctionList()
{
aPayload.append("{");
aPayload.append("\"index\": ");
- aPayload.append(OString::number(nCurIndex));
+ aPayload.append(static_cast<sal_Int64>(nCurIndex));
aPayload.append(", ");
aPayload.append("\"category\": ");
- aPayload.append(OString::number(ppFDesc->getCategory()->getNumber()));
+ aPayload.append(static_cast<sal_Int64>(ppFDesc->getCategory()->getNumber()));
aPayload.append(", ");
aPayload.append("\"signature\": \"");
aPayload.append(escapeJSON(ppFDesc->getSignature()));
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index bd3d772ca80b..e9aba13346e3 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1605,7 +1605,7 @@ bool HtmlExport::CreateHtmlForPresPages()
if( nSdPage < (mnSdPageCount-1) || bEndless )
{
aStr.append("<meta http-equiv=\"refresh\" content=\"");
- aStr.append(OUString::number(fSecs));
+ aStr.append(fSecs);
aStr.append("; URL=");
int nPage = nSdPage + 1;
@@ -2284,7 +2284,7 @@ bool HtmlExport::CreateFrames()
aStr.append("<script type=\"text/javascript\">\r\n<!--\r\n");
aStr.append("var nCurrentPage = 0;\r\nvar nPageCount = ");
- aStr.append(OUString::number(mnSdPageCount));
+ aStr.append(static_cast<sal_Int32>(mnSdPageCount));
aStr.append(";\r\n\r\n");
OUString aFunction = JS_NavigateAbs;
@@ -2318,7 +2318,7 @@ bool HtmlExport::CreateFrames()
aStr.append("</head>\r\n");
aStr.append("<frameset cols=\"*,");
- aStr.append(OUString::number((mnWidthPixel + 16)));
+ aStr.append(static_cast<sal_Int32>(mnWidthPixel + 16));
aStr.append("\">\r\n");
if(mbImpress)
{
@@ -2336,7 +2336,7 @@ bool HtmlExport::CreateFrames()
if(mbNotes)
{
aStr.append(" <frameset rows=\"42,");
- aStr.append(OUString::number(static_cast<int>(static_cast<double>(mnWidthPixel) * 0.75) + 16));
+ aStr.append(static_cast<sal_Int32>(static_cast<double>(mnWidthPixel) * 0.75) + 16);
aStr.append(",*\">\r\n");
}
else
@@ -2788,7 +2788,7 @@ OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPo
aPnt.setX( static_cast<tools::Long>(aPnt.X() * fFactor) );
aPnt.setY( static_cast<tools::Long>(aPnt.Y() * fFactor) );
- aStr.append(OUString::number(aPnt.X())).append(",").append(OUString::number(aPnt.Y()));
+ aStr.append(aPnt.X()).append(",").append(aPnt.Y());
if (nPoint < nNoOfPoints - 1)
aStr.append(',');
@@ -2952,7 +2952,7 @@ bool HtmlExport::CreateImageFileList()
OUStringBuffer aStr;
for( sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++)
{
- aStr.append(OUString::number(nSdPage + 1));
+ aStr.append(static_cast<sal_Int32>(nSdPage + 1));
aStr.append(';');
aStr.append(maURLPath);
aStr.append(maImageFiles[nSdPage]);
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 2e198ba8827e..c754cdc84f53 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -666,9 +666,9 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
sDisplay = sDisplay.replaceFirst( ":", "\\:" );
sValue = sName + sDisplay ;
sValue.append(";page-number:");
- sValue.append(OUString::number(static_cast<sal_Int16>(static_cast<sal_uInt16>((pDrViewSh->getCurrentPage()->GetPageNum()-1)>>1) + 1)) );
+ sValue.append(static_cast<sal_Int32>(static_cast<sal_uInt16>((pDrViewSh->getCurrentPage()->GetPageNum()-1)>>1) + 1));
sValue.append(";total-pages:");
- sValue.append(OUString::number(pDrViewSh->GetPageTabControl().GetPageCount()) );
+ sValue.append(static_cast<sal_Int32>(pDrViewSh->GetPageTabControl().GetPageCount()));
sValue.append(";");
if(pDrViewSh->IsLayerModeActive() && pDrViewSh->GetLayerTabControl()) // #i87182#
{
@@ -697,9 +697,9 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
sDisplay = sDisplay.replaceFirst( ":", "\\:" );
sValue.append(sDisplay);
sValue.append(";page-number:");
- sValue.append(OUString::number(pDrViewSh->GetActiveTabLayerIndex()+1) );
+ sValue.append(static_cast<sal_Int32>(pDrViewSh->GetActiveTabLayerIndex()+1));
sValue.append(";total-pages:");
- sValue.append(OUString::number(pDrViewSh->GetLayerTabControl()->GetPageCount()) );
+ sValue.append(static_cast<sal_Int32>(pDrViewSh->GetLayerTabControl()->GetPageCount()));
sValue.append(";");
}
}
@@ -747,9 +747,9 @@ uno::Any SAL_CALL AccessibleDocumentViewBase::getExtendedAttributes()
sDisplay = sDisplay.replaceFirst( ":", "\\:" );
sValue = "page-name:" + sDisplay;
sValue.append(";page-number:");
- sValue.append(OUString::number(static_cast<sal_Int16>(static_cast<sal_uInt16>((pCurrPge->GetPageNum()-1)>>1) + 1)) );
+ sValue.append(static_cast<sal_Int32>(static_cast<sal_uInt16>((pCurrPge->GetPageNum()-1)>>1) + 1));
sValue.append(";total-pages:");
- sValue.append(OUString::number(pDoc->GetSdPageCount(PageKind::Standard)) );
+ sValue.append(static_cast<sal_Int32>(pDoc->GetSdPageCount(PageKind::Standard)));
sValue.append(";");
}
}
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 747521ec210e..7191b3565cc7 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -615,7 +615,7 @@ namespace {
bFirst = false;
else
aBuf.append(',');
- aBuf.append(OUString::number(pPage->GetPageNum() / 2 + 1));
+ aBuf.append(static_cast<sal_Int32>(pPage->GetPageNum() / 2 + 1));
}
aPageRange = aBuf.makeStringAndClear();
nPrintRange = 1;
diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
index 1e4c861df8dc..0054faba9bd1 100644
--- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx
@@ -1302,7 +1302,7 @@ PDFFileImplData* PDFFile::impl_getData() const
#if OSL_DEBUG_LEVEL > 0
OUStringBuffer aTmp;
for( int i = 0; i < m_pData->m_aDocID.getLength(); i++ )
- aTmp.append(OUString::number(static_cast<unsigned int>(sal_uInt8(m_pData->m_aDocID[i])), 16));
+ aTmp.append(static_cast<sal_Int32>(sal_uInt8(m_pData->m_aDocID[i])), 16);
SAL_INFO("sdext.pdfimport.pdfparse", "DocId is <" << aTmp.makeStringAndClear() << ">");
#endif
}
@@ -1366,7 +1366,7 @@ PDFFileImplData* PDFFile::impl_getData() const
{
OUStringBuffer aTmp;
for( int i = 0; i < aEnt.getLength(); i++ )
- aTmp.append(" ").append(OUString::number(static_cast<unsigned int>(sal_uInt8(aEnt[i])), 16));
+ aTmp.append(" ").append(static_cast<sal_Int32>(sal_uInt8(aEnt[i])), 16);
SAL_WARN("sdext.pdfimport.pdfparse",
"O entry has length " << static_cast<int>(aEnt.getLength()) << ", should be 32 <" << aTmp.makeStringAndClear() << ">" );
}
@@ -1386,7 +1386,7 @@ PDFFileImplData* PDFFile::impl_getData() const
{
OUStringBuffer aTmp;
for( int i = 0; i < aEnt.getLength(); i++ )
- aTmp.append(" ").append(OUString::number(static_cast<unsigned int>(sal_uInt8(aEnt[i])), 16));
+ aTmp.append(" ").append(static_cast<sal_Int32>(sal_uInt8(aEnt[i])), 16);
SAL_WARN("sdext.pdfimport.pdfparse",
"U entry has length " << static_cast<int>(aEnt.getLength()) << ", should be 32 <" << aTmp.makeStringAndClear() << ">" );
}
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 1c70661879df..9f9af15da731 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1719,7 +1719,7 @@ OUString TimeFormatter::FormatTime (const oslDateTime& rTime)
const sal_Int32 nMinutes (sal::static_int_cast<sal_Int32>(rTime.Minutes));
const sal_Int32 nSeconds(sal::static_int_cast<sal_Int32>(rTime.Seconds));
// Hours
- sText.append(OUString::number(nHours));
+ sText.append(nHours);
sText.append(":");
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 935b49c05374..4657c87f89c9 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -938,9 +938,9 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
{
SvtViewOptions aViewOpt( EViewType::TabPage, CONFIGNAME_SEARCHPAGE );
OUStringBuffer aUserData;
- aUserData.append(OUString::number(m_xFullWordsCB->get_active() ? 1 : 0))
+ aUserData.append(static_cast<sal_Int32>(m_xFullWordsCB->get_active() ? 1 : 0))
.append(";")
- .append(OUString::number( m_xScopeCB->get_active() ? 1 : 0 ));
+ .append( static_cast<sal_Int32>(m_xScopeCB->get_active() ? 1 : 0) );
sal_Int32 nCount = std::min(m_xSearchED->get_count(), 10); // save only 10 entries
for ( sal_Int32 i = 0; i < nCount; ++i )
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index ecee69062180..fbecef81125e 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -538,7 +538,8 @@ void UsageInfo::save()
OStringBuffer aUsageInfoMsg("Document Type;Command;Count");
for (auto const& elem : maUsage)
- aUsageInfoMsg.append("\n").append(elem.first.toUtf8()).append(";").append(OString::number(elem.second));
+ aUsageInfoMsg.append("\n").append(elem.first.toUtf8())
+ .append(";").append(static_cast<sal_Int32>(elem.second));
sal_uInt64 written = 0;
auto s = aUsageInfoMsg.makeStringAndClear();
@@ -1190,7 +1191,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
if (aEvent.IsEnabled && (aEvent.State >>= aInt32))
{
- aBuffer.append(OUString::number(aInt32));
+ aBuffer.append(aInt32);
}
}
else if (aEvent.FeatureURL.Path == "TransformPosX" ||
@@ -1267,7 +1268,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
if (aEvent.IsEnabled && (aEvent.State >>= aPoint))
{
- aBuffer.append(OUString::number(aPoint.X)).append(" / ").append(OUString::number(aPoint.Y));
+ aBuffer.append(aPoint.X).append(" / ").append(aPoint.Y);
}
}
else if (aEvent.FeatureURL.Path == "Size")
@@ -1276,7 +1277,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
if (aEvent.IsEnabled && (aEvent.State >>= aSize))
{
- aBuffer.append(OUString::number(aSize.Width)).append(" x ").append(OUString::number(aSize.Height));
+ aBuffer.append(aSize.Width).append(" x ").append(aSize.Height);
}
}
else if (aEvent.FeatureURL.Path == "LanguageStatus" ||
@@ -1327,7 +1328,7 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID, SfxViewFrame* pViewFra
float nScaleValue = 1000.0;
nValue *= nScaleValue;
sal_Int32 nConvertedValue = OutputDevice::LogicToLogic(nValue, MapUnit::MapTwip, MapUnit::MapInch);
- aBuffer.append(OUString::number(nConvertedValue / nScaleValue));
+ aBuffer.append(nConvertedValue / nScaleValue);
}
}
else
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index ec1046617253..a19498de467d 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -476,7 +476,7 @@ void SfxLokHelper::notifyWindow(const SfxViewShell* pThisView,
return;
OStringBuffer aPayload;
- aPayload.append("{ \"id\": \"").append(OString::number(nLOKWindowId)).append('"');
+ aPayload.append("{ \"id\": \"").append(static_cast<sal_Int64>(nLOKWindowId)).append('"');
aPayload.append(", \"action\": \"").append(OUStringToOString(rAction, RTL_TEXTENCODING_UTF8)).append('"');
for (const auto& rItem: rPayload)
diff --git a/starmath/source/mathml/mathmlexport.cxx b/starmath/source/mathml/mathmlexport.cxx
index e6de9b285f4c..7338e7a400a2 100644
--- a/starmath/source/mathml/mathmlexport.cxx
+++ b/starmath/source/mathml/mathmlexport.cxx
@@ -473,7 +473,7 @@ void SmXMLExport::ExportContent_()
if (nSmSyntaxVersion == 5)
sStrBuf.append(u"5.0");
else
- sStrBuf.append(OUString::number(nSmSyntaxVersion));
+ sStrBuf.append(static_cast<sal_Int32>(nSmSyntaxVersion));
AddAttribute(XML_NAMESPACE_MATH, XML_ENCODING, sStrBuf.makeStringAndClear());
SvXMLElementExport aAnnotation(*this, XML_NAMESPACE_MATH, XML_ANNOTATION, true, false);
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 10250bbb22aa..6a3147d2f817 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1815,7 +1815,7 @@ bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSize)
{
nLastSize = nCurSize;
rRet.append(" size ");
- rRet.append(OUString::number(-nLstSize/32));
+ rRet.append(static_cast<sal_Int32>(-nLstSize/32));
rRet.append("{");
bRet=true;
rSetSize++;
@@ -1844,7 +1844,7 @@ bool MathType::HandleSize(sal_Int16 nLstSize,sal_Int16 nDefSize, int &rSetSize)
{
nLastSize = nCurSize;
rRet.append(" size ");
- rRet.append(OUString::number(nLstSize));
+ rRet.append(static_cast<sal_Int32>(nLstSize));
rRet.append("{");
bRet=true;
rSetSize++;
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 9762a124707c..85ee27638587 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1033,7 +1033,7 @@ sal_uInt32 SvNumberFormatter::ImpGenerateCL( LanguageType eLnge )
{
if ( i != j && xSeq[i].formatIndex == nIdx )
{
- aDupes.append(OUString::number( i ));
+ aDupes.append( i );
aDupes.append("(");
aDupes.append(xSeq[i].formatKey);
aDupes.append( ") ");
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 4a6d8abf4f32..7dba92c9866b 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -68,7 +68,7 @@ static OUString createIndex(const std::vector< OUString >& lines)
}
else
{
- aResult.append("_").append( OUString::number( *pLine, 16 ) );
+ aResult.append("_").append( static_cast<sal_Int32>(*pLine), 16 );
}
pLine++;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 963ee43d65af..a7f5ba78c4a3 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -823,9 +823,9 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const S
OString handleArrayStr;
aExtraInfo.append("{\"id\":\"");
- aExtraInfo.append(OString::number(reinterpret_cast<sal_IntPtr>(pO)));
+ aExtraInfo.append(reinterpret_cast<sal_IntPtr>(pO));
aExtraInfo.append("\",\"type\":");
- aExtraInfo.append(OString::number(pO->GetObjIdentifier()));
+ aExtraInfo.append(static_cast<sal_Int32>(pO->GetObjIdentifier()));
// In core, the gridOffset is calculated based on the LogicRect's TopLeft coordinate
// In online, we have the SnapRect and we calculate it based on its TopLeft coordinate
@@ -842,9 +842,9 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const S
if (convertMapMode)
p = OutputDevice::LogicToLogic(p, MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
aExtraInfo.append(",\"gridOffsetX\":");
- aExtraInfo.append(OString::number(p.getX()));
+ aExtraInfo.append(p.getX());
aExtraInfo.append(",\"gridOffsetY\":");
- aExtraInfo.append(OString::number(p.getY()));
+ aExtraInfo.append(p.getY());
}
if (bWriterGraphic)
@@ -909,7 +909,7 @@ void SdrMarkView::SetMarkHandlesForLOKit(tools::Rectangle const & rRect, const S
aDragParameters[0] = 100;
aExtraInfo.append(", \"initialOffset\": ");
- aExtraInfo.append(OString::number(aDragParameters[0]));
+ aExtraInfo.append(static_cast<sal_Int32>(aDragParameters[0]));
// drag direction constraint
Point aMinPos(aDragParameters[1], aDragParameters[2]);
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 3ea43a4032a0..a26bb819481e 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -551,7 +551,7 @@ OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow )
static_cast<sal_uInt16>(nCol)));
aBuf.append(comphelper::string::reverseString(aStr.makeStringAndClear()));
}
- aBuf.append( OUString::number(nRow+1) );
+ aBuf.append(nRow+1);
return aBuf.makeStringAndClear();
}
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 5149d222a3d2..ecd1b119b95e 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -731,7 +731,7 @@ OUString SwNumRule::MakeNumString( const SwNumberTree::tNumberVector & rNumVecto
if (rNumVector[i])
{
if (bOnlyArabic)
- aStr.append(OUString::number(rNumVector[i]));
+ aStr.append(rNumVector[i]);
else
aStr.append(rNFormat.GetNumStr(rNumVector[i], aLocale));
}
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index cdff7c6fe588..17c5dbf1d070 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -463,7 +463,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTable, OUStringBuffer& rNew
{
const SwTableBox *pRelLastBox = lcl_RelToBox( rTable, pBox, *pLastBox );
if ( pRelLastBox )
- rNewStr.append(OUString::number(reinterpret_cast<sal_PtrDiff>(pRelLastBox)));
+ rNewStr.append(reinterpret_cast<sal_PtrDiff>(pRelLastBox));
else
rNewStr.append("0");
rNewStr.append(":");
@@ -472,7 +472,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTable, OUStringBuffer& rNew
const SwTableBox *pRelFirstBox = lcl_RelToBox( rTable, pBox, rFirstBox );
if ( pRelFirstBox )
- rNewStr.append(OUString::number(reinterpret_cast<sal_PtrDiff>(pRelFirstBox)));
+ rNewStr.append(reinterpret_cast<sal_PtrDiff>(pRelFirstBox));
else
rNewStr.append("0");
@@ -557,13 +557,13 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTable, OUStringBuffer& rNewStr
if( pLastBox )
{
pBox = rTable.GetTableBox( *pLastBox );
- rNewStr.append(OUString::number(reinterpret_cast<sal_PtrDiff>(pBox)))
+ rNewStr.append(reinterpret_cast<sal_PtrDiff>(pBox))
.append(":");
rFirstBox = rFirstBox.copy( pLastBox->getLength()+1 );
}
pBox = rTable.GetTableBox( rFirstBox );
- rNewStr.append(OUString::number(reinterpret_cast<sal_PtrDiff>(pBox)))
+ rNewStr.append(reinterpret_cast<sal_PtrDiff>(pBox))
.append(rFirstBox[ rFirstBox.getLength()-1 ]); // get label for the box
}
@@ -1222,9 +1222,9 @@ void SwTableFormula::SplitMergeBoxNm_( const SwTable& rTable, OUStringBuffer& rN
}
if( pLastBox )
- rNewStr.append(OUString::number(reinterpret_cast<sal_PtrDiff>(pEndBox))).append(":");
+ rNewStr.append(reinterpret_cast<sal_PtrDiff>(pEndBox)).append(":");
- rNewStr.append(OUString::number(reinterpret_cast<sal_PtrDiff>(pSttBox)))
+ rNewStr.append(reinterpret_cast<sal_PtrDiff>(pSttBox))
.append(rFirstBox[ rFirstBox.getLength()-1] );
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index c88cc4c77f45..9a98ce61fc94 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -432,14 +432,14 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, tools::Long nVal,
}
sal_Int64 nResult = o3tl::convert(nVal * nFac, o3tl::Length::twip, eTo);
- rOut.append(OString::number(nResult/nFac));
+ rOut.append(nResult/nFac);
if ((nResult % nFac) != 0)
{
rOut.append('.');
while (nFac > 1 && (nResult % nFac) != 0)
{
nFac /= 10;
- rOut.append(OString::number((nResult / nFac) % 10));
+ rOut.append((nResult / nFac) % 10);
}
}
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7850fca4a6a2..2b7cb420d6c6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7357,7 +7357,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
{
aBuffer.append( pPrev, pIt - pPrev );
aBuffer.append( '%' );
- aBuffer.append( OUString::number( sal_Int32( *pIt ) + 1 ) );
+ aBuffer.append( sal_Int32( *pIt ) + 1 );
pPrev = pIt + 1;
}
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 3bcdebc3cf11..59be0e879393 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -573,7 +573,7 @@ sal_Int32 RtfSdrExport::StartShape()
// Order inside the group shape is not relevant for the flat shape list
// we write.
m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPZ);
- m_rAttrOutput.RunText().append(OString::number(m_pSdrObject->GetOrdNum()));
+ m_rAttrOutput.RunText().append(static_cast<sal_Int64>(m_pSdrObject->GetOrdNum()));
}
for (auto it = m_aShapeProps.rbegin(); it != m_aShapeProps.rend(); ++it)
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index f5a9b4a201ad..20bde25caa5b 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -200,7 +200,7 @@ OUString SwModuleOptions::ConvertWordDelimiter(const OUString& rDelim, bool bFro
default:
if( c <= 0x1f || c >= 0x7f )
{
- sReturn.append("\\x").append(OUString::number( c, 16 ));
+ sReturn.append("\\x").append( static_cast<sal_Int32>(c), 16 );
}
else
{
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 8fc8f681dbea..a2e7c29a7361 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -402,9 +402,9 @@ OUString SwPagePreviewWin::GetStatusStr( sal_uInt16 nPageCnt ) const
const sal_uInt16 nVirtPageNum = mpPgPreviewLayout->GetVirtPageNumByPageNum( nPageNum );
if( nVirtPageNum && nVirtPageNum != nPageNum )
{
- aStatusStr.append( OUString::number(nVirtPageNum) ).append( " " );
+ aStatusStr.append(static_cast<sal_Int32>(nVirtPageNum)).append( " " );
}
- aStatusStr.append( OUString::number(nPageNum) ).append( " / " ).append( OUString::number(nPageCnt) );
+ aStatusStr.append(static_cast<sal_Int32>(nPageNum)).append( " / " ).append(static_cast<sal_Int32>(nPageCnt));
return aStatusStr.makeStringAndClear();
}
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 65ae31a99767..4f82c1c5cd90 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1035,7 +1035,7 @@ static OUString lcl_CreateOutlineString(const size_t nIndex, const SwDoc* pDoc)
tools::Long nVal = aNumVector[nLevel];
nVal ++;
nVal -= pOutlRule->Get(nLevel).GetStart();
- sEntry.append(OUString::number( nVal ));
+ sEntry.append( nVal );
sEntry.append(".");
}
OUString sOutlineText = pDoc->getIDocumentOutlineNodes().getOutlineText(
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index be107498c1d8..effcdae4380e 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@@ -192,7 +192,7 @@ css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions( )
OUStringBuffer aDescr( "*;*;" );
aDescr.append(GetPrinter()->GetPaperBinName( n ));
aDescr.append(';');
- aDescr.append(OUString::number(n));
+ aDescr.append(static_cast<sal_Int32>(n));
aDescr.append(";*;*");
aDescriptions.getArray()[n] = aDescr.makeStringAndClear();
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 7d39fdecac58..82406a3624ff 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -201,7 +201,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
if ( caught >>= specialized )
{
sMessage.append(" ArgumentPosition: ");
- sMessage.append(OString::number(specialized.ArgumentPosition));
+ sMessage.append(static_cast<sal_Int32>(specialized.ArgumentPosition));
}
}
{
@@ -225,7 +225,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
if ( caught >>= specialized )
{
sMessage.append(" ErrorCode: ");
- sMessage.append(OString::number(specialized.ErrorCode));
+ sMessage.append(specialized.ErrorCode);
}
}
{
@@ -233,7 +233,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
if ( caught >>= specialized )
{
sMessage.append(" ErrorCode: ");
- sMessage.append(OString::number(specialized.ErrorCode));
+ sMessage.append(specialized.ErrorCode);
sMessage.append(" ErrorMessageArgument: ");
sMessage.append(toOString(specialized.ErrorMessageArgument));
}
@@ -245,9 +245,9 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
sMessage.append(" DestinationTypeClass: ");
sMessage.append(toOString(comphelper::anyToString(css::uno::Any(specialized.DestinationTypeClass))));
sMessage.append(" Reason: ");
- sMessage.append(OString::number(specialized.Reason));
+ sMessage.append(specialized.Reason);
sMessage.append(" ArgumentIndex: ");
- sMessage.append(OString::number(specialized.ArgumentIndex));
+ sMessage.append(specialized.ArgumentIndex);
}
}
{
@@ -259,7 +259,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
sMessage.append(" language: ");
sMessage.append(toOString(specialized.language));
sMessage.append(" lineNum: ");
- sMessage.append(OString::number(specialized.lineNum));
+ sMessage.append(specialized.lineNum);
}
}
{
@@ -279,7 +279,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
sMessage.append(" language: ");
sMessage.append(toOString(specialized.language));
sMessage.append(" errorType: ");
- sMessage.append(OString::number(specialized.errorType));
+ sMessage.append(specialized.errorType);
}
}
{
@@ -289,7 +289,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
sMessage.append(" SQLState: ");
sMessage.append(toOString(specialized.SQLState));
sMessage.append(" ErrorCode: ");
- sMessage.append(OString::number(specialized.ErrorCode));
+ sMessage.append(specialized.ErrorCode);
sMessage.append("\n wrapped: ");
sMessage.append(exceptionToString(specialized.NextException));
}
@@ -299,7 +299,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
if ( caught >>= specialized )
{
sMessage.append(" PosixError: ");
- sMessage.append(OString::number(specialized.PosixError));
+ sMessage.append(specialized.PosixError);
}
}
{
@@ -307,7 +307,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
if ( caught >>= specialized )
{
sMessage.append(" errcode: ");
- sMessage.append(OString::number( specialized.ErrCode ));
+ sMessage.append( specialized.ErrCode );
}
}
{
@@ -347,7 +347,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
if ( caught >>= specialized )
{
sMessage.append(" CheckPos: ");
- sMessage.append(OString::number( specialized.CheckPos ));
+ sMessage.append( specialized.CheckPos );
}
}
{
@@ -383,9 +383,9 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
sMessage.append(" SystemId: ");
sMessage.append(toOString( specialized.SystemId ));
sMessage.append(" LineNumber: ");
- sMessage.append(OString::number( specialized.LineNumber ));
+ sMessage.append( specialized.LineNumber );
sMessage.append(" ColumnNumber: ");
- sMessage.append(OString::number( specialized.ColumnNumber ));
+ sMessage.append( specialized.ColumnNumber );
}
}
{
@@ -393,7 +393,7 @@ static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any &
if ( caught >>= specialized )
{
sMessage.append(" Code: ");
- sMessage.append(OString::number( static_cast<sal_Int32>(specialized.Code) ));
+ sMessage.append( static_cast<sal_Int32>(specialized.Code) );
}
}
}
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index eef92021aa2a..fc5676de7fbc 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -2425,7 +2425,7 @@ bool INetURLObject::parseHost(sal_Unicode const *& rBegin, sal_Unicode const * p
if (*p == '.')
if (nOctets < 4)
{
- aTheCanonic.append( OUString::number(nNumber) );
+ aTheCanonic.append(static_cast<sal_Int64>(nNumber));
aTheCanonic.append( '.' );
++nOctets;
eState = STATE_IP4_DOT;
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 34c6ea2b31df..9dd1b6bf0b73 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -1566,7 +1566,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
{
OUStringBuffer aNew = aNewUri.getUri();
aNew.append( "_" );
- aNew.append( OUString::number( ++nTry ) );
+ aNew.append( ++nTry );
aNewUri.setUri( aNew.makeStringAndClear() );
}
while ( hasData( aNewUri ) && ( nTry < 1000 ) );
@@ -1586,7 +1586,7 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
{
OUStringBuffer aNewTitle = m_aProps.getTitle();
aNewTitle.append( "_" );
- aNewTitle.append( OUString::number( ++nTry ) );
+ aNewTitle.append( ++nTry );
m_aProps.setTitle( aNewTitle.makeStringAndClear() );
}
}
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 4c88819e7bb5..df641fce518d 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -189,7 +189,7 @@ void NeonUri::calculateURI ()
if ( bAppendPort )
{
aBuf.append( ":" );
- aBuf.append( OUString::number( mPort ) );
+ aBuf.append( mPort );
}
aBuf.append( mPath );
@@ -283,7 +283,7 @@ OUString NeonUri::makeConnectionEndPointString(
if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) )
{
aBuf.append( ":" );
- aBuf.append( OUString::number( nPort ) );
+ aBuf.append( static_cast<sal_Int32>(nPort) );
}
return aBuf.makeStringAndClear();
}
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx
index dab11a64cfa9..8852779faeba 100644
--- a/ucb/source/ucp/webdav/SerfUri.cxx
+++ b/ucb/source/ucp/webdav/SerfUri.cxx
@@ -146,7 +146,7 @@ void SerfUri::calculateURI ()
if ( bAppendPort )
{
aBuf.append( ":" );
- aBuf.append( OUString::number( mPort ) );
+ aBuf.append( mPort );
}
aBuf.append( mPath );
@@ -240,7 +240,7 @@ OUString SerfUri::makeConnectionEndPointString(
if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) )
{
aBuf.append( ":" );
- aBuf.append( OUString::number( sal_Int32( nPort ) ) );
+ aBuf.append( sal_Int32( nPort ) );
}
return aBuf.makeStringAndClear();
}
diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 2c24e3d232ad..f3601e058aa0 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -425,7 +425,7 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const OUString & rHost,
}
aBuffer.append( ':' );
- aBuffer.append( OUString::number( nPort ) );
+ aBuffer.append( nPort );
const OUString aHostAndPort( aBuffer.makeStringAndClear() );
for (auto const& noProxy : m_aNoProxyList)
diff --git a/vcl/source/gdi/mtfxmldump.cxx b/vcl/source/gdi/mtfxmldump.cxx
index d920724cde32..373eb2b20a69 100644
--- a/vcl/source/gdi/mtfxmldump.cxx
+++ b/vcl/source/gdi/mtfxmldump.cxx
@@ -762,7 +762,7 @@ void MetafileXmlDump::writeXml(const GDIMetaFile& rMetaFile, tools::XmlWriter& r
OUStringBuffer sDxLengthString;
for (sal_Int32 i = 0; i < aLength - aIndex; ++i)
{
- sDxLengthString.append(OUString::number(pMetaTextArrayAction->GetDXArray()[aIndex + i]));
+ sDxLengthString.append(pMetaTextArrayAction->GetDXArray()[aIndex + i]);
sDxLengthString.append(" ");
}
rWriter.content(sDxLengthString.makeStringAndClear());
diff --git a/vcl/source/gdi/pdfobjectcopier.cxx b/vcl/source/gdi/pdfobjectcopier.cxx
index 596ed3a2587d..121eddb8b6de 100644
--- a/vcl/source/gdi/pdfobjectcopier.cxx
+++ b/vcl/source/gdi/pdfobjectcopier.cxx
@@ -230,11 +230,7 @@ OString PDFObjectCopier::copyExternalResources(filter::PDFObjectElement& rPage,
OStringBuffer sRet("/" + rKind + "<<");
for (const auto& rPair : aRet)
{
- sRet.append("/")
- .append(rPair.first)
- .append(" ")
- .append(OString::number(rPair.second))
- .append(" 0 R");
+ sRet.append("/").append(rPair.first).append(" ").append(rPair.second).append(" 0 R");
}
sRet.append(">>");
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 13eea80c71e1..ffb6b1a8f6c8 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -100,14 +100,14 @@ void UITestLogger::logCommand(const OUString& rAction,
sal_Int32 nValue = 0;
rProp.Value >>= nValue;
aBuffer.append("\"").append(rProp.Name).append("\": ");
- aBuffer.append(OUString::number(nValue)).append(", ");
+ aBuffer.append(nValue).append(", ");
}
else if (aTypeName == "unsigned long")
{
sal_uInt32 nValue = 0;
rProp.Value >>= nValue;
aBuffer.append("\"").append(rProp.Name).append("\": ");
- aBuffer.append(OUString::number(nValue)).append(", ");
+ aBuffer.append(static_cast<sal_Int64>(nValue)).append(", ");
}
else if (aTypeName == "boolean")
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f4a66c5c3c98..486a5bde6444 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2264,7 +2264,7 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState)
aStream.ReadUChar(ch);
if (ch < 16)
aBuf.append("0");
- aBuf.append(OUString::number(ch, 16));
+ aBuf.append(static_cast<sal_Int32>(ch), 16);
}
m_aStates.top().getDestinationText() = aBuf;
}
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 339d3b268768..f003717193a2 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -1207,7 +1207,7 @@ void AnimationsExporterImpl::exportAnimate( const Reference< XAnimate >& xAnimat
if( !sTmp.isEmpty() )
sTmp.append( ';' );
- sTmp.append( OUString::number(rPair.Time) ).append( "," ).append( OUString::number(rPair.Progress) );
+ sTmp.append(rPair.Time).append( "," ).append(rPair.Progress);
}
mxExport->AddAttribute( XML_NAMESPACE_SMIL, XML_KEYSPLINES, sTmp.makeStringAndClear() );
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 37e9258f2861..37d49afd1f12 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -3799,14 +3799,14 @@ static void ExportParameter( OUStringBuffer& rStrBuffer, const css::drawing::Enh
{
case css::drawing::EnhancedCustomShapeParameterType::EQUATION :
{
- rStrBuffer.append( "?f" ).append(OUString::number( nValue ) );
+ rStrBuffer.append( "?f" ).append( nValue );
}
break;
case css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT :
{
rStrBuffer.append( '$' );
- rStrBuffer.append( OUString::number( nValue ) );
+ rStrBuffer.append( nValue );
}
break;
@@ -3835,7 +3835,7 @@ static void ExportParameter( OUStringBuffer& rStrBuffer, const css::drawing::Enh
case css::drawing::EnhancedCustomShapeParameterType::LOGHEIGHT :
rStrBuffer.append( GetXMLToken( XML_LOGHEIGHT ) ); break;
default :
- rStrBuffer.append( OUString::number( nValue ) );
+ rStrBuffer.append( nValue );
}
}
}
diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx
index 74ea521322c6..de9ee4ec27a4 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -547,7 +547,7 @@ namespace xmloff
aBuffer.append(getINT64(_rValue));
break;
case TypeClass_UNSIGNED_HYPER:
- aBuffer.append(OUString::number(_rValue.get<sal_uInt64>()));
+ aBuffer.append(static_cast<sal_Int64>(_rValue.get<sal_uInt64>()));
break;
case TypeClass_ENUM:
{
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 3ad50034cb13..34dc16a32cc0 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -174,7 +174,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam
if (sXMLName.isEmpty())
continue;
aStemBuffer.append("-");
- aStemBuffer.append(OUString::number(rFamilyData.mxMapper->getPropertySetMapper()->GetEntryNameSpace(rState.mnIndex)));
+ aStemBuffer.append(static_cast<sal_Int32>(rFamilyData.mxMapper->getPropertySetMapper()->GetEntryNameSpace(rState.mnIndex)));
aStemBuffer.append(":");
aStemBuffer.append(sXMLName);
aStemBuffer.append("=");
@@ -186,7 +186,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam
// styles always come out in the same order. Will see if this works.
aStemBuffer.append("-z");
static sal_Int32 nCounter = 0;
- aStemBuffer.append(OUString::number(nCounter++));
+ aStemBuffer.append(nCounter++));
#endif
// create a name that hasn't been used before. The created name has not
@@ -204,7 +204,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam
rFamilyData.mnName++;
aTry.append( aStemBuffer );
aTry.append( "-" );
- aTry.append( OUString::number( rFamilyData.mnName ) );
+ aTry.append( static_cast<sal_Int64>(rFamilyData.mnName) );
msName = aTry.makeStringAndClear();
}
rFamilyData.maNameSet.insert(msName);
@@ -218,7 +218,7 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam
{
rFamilyData.mnName++;
sBuffer.append( rFamilyData.maStrPrefix );
- sBuffer.append( OUString::number( rFamilyData.mnName ) );
+ sBuffer.append( static_cast<sal_Int64>(rFamilyData.mnName) );
msName = sBuffer.makeStringAndClear();
}
while (rFamilyData.maNameSet.find(msName) != rFamilyData.maNameSet.end() || rFamilyData.maReservedNameSet.find(msName) != rFamilyData.maReservedNameSet.end());
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 0a728467e4ba..8bb6352408b1 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -482,9 +482,9 @@ bool XMLColorPropHdl::exportXML( OUString& rStrExpValue, const Any& rValue, cons
Sequence< double > aHSL;
if( (rValue >>= aHSL) && (aHSL.getLength() == 3) )
{
- aOut.append( "hsl(" ).append( OUString::number(aHSL[0]) ).append( "," )
- .append( OUString::number(aHSL[1] * 100.0) ).append( "%," )
- .append( OUString::number(aHSL[2] * 100.0) ).append( "%)" );
+ aOut.append( "hsl(" ).append(aHSL[0]).append( "," )
+ .append(aHSL[1] * 100.0).append( "%," )
+ .append(aHSL[2] * 100.0).append( "%)" );
rStrExpValue = aOut.makeStringAndClear();
bRet = true;
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 7641e9ec3fad..d875d6545f7f 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -659,9 +659,9 @@ OUString xforms_bool( const Any& rAny )
void xforms_formatDate( OUStringBuffer& aBuffer, const util::Date& rDate )
{
- aBuffer.append(OUString::number(static_cast<sal_Int32>( rDate.Year ) ))
- .append("-").append(OUString::number(static_cast<sal_Int32>( rDate.Month )))
- .append("-").append(OUString::number(static_cast<sal_Int32>( rDate.Day )));
+ aBuffer.append(static_cast<sal_Int32>( rDate.Year ))
+ .append("-").append(static_cast<sal_Int32>( rDate.Month ))
+ .append("-").append(static_cast<sal_Int32>( rDate.Day ));
}
void xforms_formatTime( OUStringBuffer& aBuffer, const css::util::Time& rTime )
diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx
index 359c4a2f3f44..d966217ee853 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -200,7 +200,7 @@ OUString BufferNode::printChildren() const
for( const ElementCollector* ii : m_vElementCollectors )
{
- rc.append("BufID=").append(OUString::number(ii->getBufferId()));
+ rc.append("BufID=").append(ii->getBufferId());
if (ii->getModify())
{
@@ -222,7 +222,7 @@ OUString BufferNode::printChildren() const
break;
}
- rc.append("(SecID=").append(OUString::number(ii->getSecurityId())).append(") ");
+ rc.append("(SecID=").append(ii->getSecurityId()).append(") ");
}
return rc.makeStringAndClear();
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 5e2f697d64ac..41b0a89b57ad 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -308,8 +308,8 @@ OUString SAXEventKeeperImpl::printBufferNode(
ElementMark * pBlocker = pBufferNode->getBlocker();
if (pBlocker != nullptr)
{
- rc.append(OUString::number( pBlocker->getBufferId() )).append("(SecId=")
- .append(OUString::number( pBlocker->getSecurityId() )).append(") ");
+ rc.append( pBlocker->getBufferId() ).append("(SecId=")
+ .append( pBlocker->getSecurityId() ).append(") ");
}
rc.append("\n");
More information about the Libreoffice-commits
mailing list