summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-11-12 11:46:21 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-11-12 12:11:36 +0100
commitb2247f86e42c05991165834ff5d63731b0da2b3b (patch)
tree228aa497c115de6cee2e7da625fd38610c368cbc /svgio
parent67c541621b701a6873f4e507ad9cc4119b2985bf (diff)
improve mergeToSinglePolyPolygon
spotted by llunak. No need to take param by &&, since mergeToSinglePol does not actually need to modify it. Also flatten it a little. Change-Id: I2f5ade347db756e21ecb0a88c3935805268f5072 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125086 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'svgio')
-rw-r--r--svgio/source/svgreader/svgclippathnode.cxx2
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx
index 7f4b4beae8ec..31ac632d33dc 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -148,7 +148,7 @@ namespace svgio::svgreader
if(nSize > 1)
{
// merge to single clipPolyPolygon
- aClipPolyPolygon = basegfx::utils::mergeToSinglePolyPolygon(std::vector(rResult));
+ aClipPolyPolygon = basegfx::utils::mergeToSinglePolyPolygon(rResult);
}
else
{
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index e7a0d90b7efc..21ef7cebf5cf 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -304,7 +304,7 @@ namespace svgio::svgreader
if(!aTextFillVector.empty())
{
- aMergedArea = basegfx::utils::mergeToSinglePolyPolygon(std::move(aTextFillVector));
+ aMergedArea = basegfx::utils::mergeToSinglePolyPolygon(aTextFillVector);
}
}
@@ -763,7 +763,7 @@ namespace svgio::svgreader
{
const basegfx::B2DPolyPolygon aMergedArea(
basegfx::utils::mergeToSinglePolyPolygon(
- std::vector(rLineFillVector)));
+ rLineFillVector));
if(aMergedArea.count())
{