comphelper/source/misc/xmlsechelper.cxx | 4 ++--
emfio/source/reader/emfreader.cxx | 2 +-
emfio/source/reader/mtftools.cxx | 4 ++--
emfio/source/reader/wmfreader.cxx | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 32e82f3dc3c42488245bdd813ba4f5f53c59791d
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Dec 22 13:31:36 2023 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Dec 22 18:12:23 2023 +0100
Use emplace_back instead of push_back (comphelper)
Change-Id: Ie3b033dc159ee3f848afa3e8cbabdbdfd402e644
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161178
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/comphelper/source/misc/xmlsechelper.cxx
b/comphelper/source/misc/xmlsechelper.cxx
index 5b1a438abbea..a96ff6937374 100644
--- a/comphelper/source/misc/xmlsechelper.cxx
+++ b/comphelper/source/misc/xmlsechelper.cxx
@@ -130,7 +130,7 @@ std::vector< std::pair< OUString, OUString> >
parseDN(std::u16string_view rRawSt
if (!bInValue)
{
OSL_ASSERT(!sType.empty());
- retVal.push_back(std::make_pair(OUString(sType),
sbufValue.makeStringAndClear()));
+ retVal.emplace_back(OUString(sType),
sbufValue.makeStringAndClear());
sType = {};
//The next char is the start of the new type
nTypeNameStart = i + 1;
@@ -153,7 +153,7 @@ std::vector< std::pair< OUString, OUString> >
parseDN(std::u16string_view rRawSt
if (sbufValue.getLength())
{
OSL_ASSERT(!sType.empty());
- retVal.push_back(std::make_pair(OUString(sType),
sbufValue.makeStringAndClear()));
+ retVal.emplace_back(OUString(sType),
sbufValue.makeStringAndClear());
}
return retVal;
}
commit 88f9b3f16b3e8c6af230ade1c4d56d09c7579675
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Dec 22 16:17:50 2023 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Dec 22 18:12:14 2023 +0100
Use emplace_back instead of push_back (emfio)
Change-Id: I23bd626973c9aa0b4a961b16d5817d58c5f0cf7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161188
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/emfio/source/reader/emfreader.cxx
b/emfio/source/reader/emfreader.cxx
index f1ac4ff7eda5..9c6ef8280330 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -959,7 +959,7 @@ namespace emfio
{
sal_Int32 nX, nY;
*mpInputStream >> nX >> nY;
- aPoints.push_back(Point(nX, nY));
+ aPoints.emplace_back(nX, nY);
}
aPointTypes.reserve(std::min<size_t>(nPointsCount,
mpInputStream->remainingSize()));
for (sal_uInt32 i = 0; i < nPointsCount &&
mpInputStream->good(); i++)
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 5acfdd8148b1..6eee28002321 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -332,13 +332,13 @@ namespace emfio
if(nPositive >= nNegative)
{
// correction intended, it is probably an old imported file
-
maPositiveIdentifiedCases.push_back(std::pair<rtl::Reference<MetaFontAction>,
double>(maCurrentMetaFontAction, fAverage));
+
maPositiveIdentifiedCases.emplace_back(maCurrentMetaFontAction, fAverage);
}
else
{
// correction not favorable in the majority of cases for this
Font, still
// remember to have a weight in the last decision for
correction
-
maNegativeIdentifiedCases.push_back(std::pair<rtl::Reference<MetaFontAction>,
double>(maCurrentMetaFontAction, fAverage));
+
maNegativeIdentifiedCases.emplace_back(maCurrentMetaFontAction, fAverage);
}
}
diff --git a/emfio/source/reader/wmfreader.cxx
b/emfio/source/reader/wmfreader.cxx
index 4c74229fc8c8..414218c717bb 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -1051,7 +1051,7 @@ namespace emfio
//PALETTEENTRY: Values, Blue, Green, Red
mpInputStream->ReadUInt32( nPalleteEntry );
SAL_INFO("emfio", " " << i << ". Palette
entry: " << std::setw(10) << std::showbase <<std::hex << nPalleteEntry <<
std::dec );
-
aPaletteColors.push_back(Color(static_cast<sal_uInt8>(nPalleteEntry),
static_cast<sal_uInt8>(nPalleteEntry >> 8),
static_cast<sal_uInt8>(nPalleteEntry >> 16)));
+
aPaletteColors.emplace_back(static_cast<sal_uInt8>(nPalleteEntry),
static_cast<sal_uInt8>(nPalleteEntry >> 8),
static_cast<sal_uInt8>(nPalleteEntry >> 16));
}
CreateObject(std::make_unique<WinMtfPalette>( aPaletteColors
));
}
