summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-11 08:54:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-11 09:44:12 +0200
commit3428bd5fa3626844355f20997ba690fd04297982 (patch)
tree683256f95828e54edecdd87fbde0ce32a634a834 /drawinglayer
parent9c5c905680f7cb58eb3d0fbf25725a50c17896da (diff)
clang-tidy modernize-use-emplace in d*
Change-Id: I79ac90faf24b4c741545e411dbaea7826c2df531 Reviewed-on: https://gerrit.libreoffice.org/42150 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/primitive2d/animatedprimitive2d.cxx2
-rw-r--r--drawinglayer/source/primitive2d/svggradientprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx2
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx22
-rw-r--r--drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx2
-rw-r--r--drawinglayer/source/processor2d/contourextractor2d.cxx8
-rw-r--r--drawinglayer/source/processor2d/textaspolygonextractor2d.cxx6
-rw-r--r--drawinglayer/source/processor2d/vclhelperbufferdevice.cxx2
-rw-r--r--drawinglayer/source/tools/emfphelperdata.cxx12
-rw-r--r--drawinglayer/source/tools/wmfemfhelper.cxx4
10 files changed, 32 insertions, 33 deletions
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 6110013366e3..00af2589627d 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -137,7 +137,7 @@ namespace drawinglayer
for(sal_uInt32 a(0); a < nCount; a++)
{
- maMatrixStack.push_back(basegfx::tools::B2DHomMatrixBufferedDecompose(rmMatrixStack[a]));
+ maMatrixStack.emplace_back(rmMatrixStack[a]);
}
}
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index e9f67216869c..60fc556a4f52 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -695,11 +695,10 @@ namespace drawinglayer
{
const SvgGradientEntry& rCandidate = getGradientEntries()[nCount - 1 - a];
- maMirroredGradientEntries.push_back(
- SvgGradientEntry(
+ maMirroredGradientEntries.emplace_back(
1.0 - rCandidate.getOffset(),
rCandidate.getColor(),
- rCandidate.getOpacity()));
+ rCandidate.getOpacity());
}
}
}
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index b546d8b0c544..9b6d650e0303 100644
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
@@ -130,7 +130,7 @@ namespace drawinglayer
for(sal_uInt32 a(0); a < aFill.count(); a++)
{
- a3DPolyPolygonVector.push_back(basegfx::B3DPolyPolygon(aFill.getB3DPolygon(a)));
+ a3DPolyPolygonVector.emplace_back(aFill.getB3DPolygon(a));
}
if(!getSdrLFSAttribute().getFill().isDefault())
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index e8d75ee49879..880519b3afa2 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -364,7 +364,7 @@ namespace drawinglayer
if(basegfx::fTools::equalZero(fRotation) || 0 == nSteps)
{
// no rotation or no steps, just one plane
- rSliceVector.push_back(Slice3D(rSource, basegfx::B3DHomMatrix()));
+ rSliceVector.emplace_back(rSource, basegfx::B3DHomMatrix());
}
else
{
@@ -406,7 +406,7 @@ namespace drawinglayer
impGetOuterPolyPolygon(aFront, aOuterFront, fOffsetLen, bCharacterMode);
basegfx::B3DHomMatrix aTransform;
aTransform.translate(0.0, 0.0, fOffsetLen);
- rSliceVector.push_back(Slice3D(aOuterFront, aTransform, SLICETYPE3D_FRONTCAP));
+ rSliceVector.emplace_back(aOuterFront, aTransform, SLICETYPE3D_FRONTCAP);
}
if(bCloseBack)
@@ -421,7 +421,7 @@ namespace drawinglayer
// add start polygon (a = 0)
if(!bClosedRotation)
{
- rSliceVector.push_back(Slice3D(aFront, basegfx::B3DHomMatrix()));
+ rSliceVector.emplace_back(aFront, basegfx::B3DHomMatrix());
}
// create segments (a + 1 .. nSteps)
@@ -433,12 +433,12 @@ namespace drawinglayer
basegfx::B2DPolyPolygon aNewPoly(bBackScale ? basegfx::tools::interpolate(aFront, aBack, fStep) : aFront);
basegfx::B3DHomMatrix aNewMat;
aNewMat.rotate(0.0, fRotation * fStep, 0.0);
- rSliceVector.push_back(Slice3D(aNewPoly, aNewMat));
+ rSliceVector.emplace_back(aNewPoly, aNewMat);
}
if(bCloseBack)
{
- rSliceVector.push_back(Slice3D(aOuterBack, aTransformBack, SLICETYPE3D_BACKCAP));
+ rSliceVector.emplace_back(aOuterBack, aTransformBack, SLICETYPE3D_BACKCAP);
}
}
}
@@ -456,7 +456,7 @@ namespace drawinglayer
if(basegfx::fTools::equalZero(fDepth))
{
// no depth, just one plane
- rSliceVector.push_back(Slice3D(rSource, basegfx::B3DHomMatrix()));
+ rSliceVector.emplace_back(rSource, basegfx::B3DHomMatrix());
}
else
{
@@ -488,7 +488,7 @@ namespace drawinglayer
impGetOuterPolyPolygon(aFront, aOuterFront, fOffset, bCharacterMode);
basegfx::B3DHomMatrix aTransformFront;
aTransformFront.translate(0.0, 0.0, fDepth);
- rSliceVector.push_back(Slice3D(aOuterFront, aTransformFront, SLICETYPE3D_FRONTCAP));
+ rSliceVector.emplace_back(aOuterFront, aTransformFront, SLICETYPE3D_FRONTCAP);
}
if(bCloseBack)
@@ -503,15 +503,15 @@ namespace drawinglayer
basegfx::B3DHomMatrix aTransformA, aTransformB;
aTransformA.translate(0.0, 0.0, fZFront);
- rSliceVector.push_back(Slice3D(aFront, aTransformA));
+ rSliceVector.emplace_back(aFront, aTransformA);
aTransformB.translate(0.0, 0.0, fZBack);
- rSliceVector.push_back(Slice3D(aBack, aTransformB));
+ rSliceVector.emplace_back(aBack, aTransformB);
}
if(bCloseBack)
{
- rSliceVector.push_back(Slice3D(aOuterBack, basegfx::B3DHomMatrix(), SLICETYPE3D_BACKCAP));
+ rSliceVector.emplace_back(aOuterBack, basegfx::B3DHomMatrix(), SLICETYPE3D_BACKCAP);
}
}
}
@@ -891,7 +891,7 @@ namespace drawinglayer
for(a = 0; a < aEdgeRounding.count(); a++)
{
- rFill.push_back(basegfx::B3DPolyPolygon(aEdgeRounding.getB3DPolygon(a)));
+ rFill.emplace_back(aEdgeRounding.getB3DPolygon(a));
}
}
}
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index ee3b419ef146..e09476df2c19 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -119,7 +119,7 @@ namespace drawinglayer
for(sal_uInt32 a(0); a < aFill.count(); a++)
{
- a3DPolyPolygonVector.push_back(basegfx::B3DPolyPolygon(aFill.getB3DPolygon(a)));
+ a3DPolyPolygonVector.emplace_back(aFill.getB3DPolygon(a));
}
if(!getSdrLFSAttribute().getFill().isDefault())
diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx
index 6162994316dd..5015544f4c18 100644
--- a/drawinglayer/source/processor2d/contourextractor2d.cxx
+++ b/drawinglayer/source/processor2d/contourextractor2d.cxx
@@ -70,7 +70,7 @@ namespace drawinglayer
basegfx::tools::openWithGeometryChange(aLocalPolygon);
}
- maExtractedContour.push_back(basegfx::B2DPolyPolygon(aLocalPolygon));
+ maExtractedContour.emplace_back(aLocalPolygon);
}
break;
}
@@ -90,7 +90,7 @@ namespace drawinglayer
basegfx::B2DHomMatrix aLocalTransform(getViewInformation2D().getObjectTransformation() * rBitmapCandidate.getTransform());
basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon());
aPolygon.transform(aLocalTransform);
- maExtractedContour.push_back(basegfx::B2DPolyPolygon(aPolygon));
+ maExtractedContour.emplace_back(aPolygon);
break;
}
case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
@@ -100,7 +100,7 @@ namespace drawinglayer
basegfx::B2DHomMatrix aLocalTransform(getViewInformation2D().getObjectTransformation() * rMetaCandidate.getTransform());
basegfx::B2DPolygon aPolygon(basegfx::tools::createUnitPolygon());
aPolygon.transform(aLocalTransform);
- maExtractedContour.push_back(basegfx::B2DPolyPolygon(aPolygon));
+ maExtractedContour.emplace_back(aPolygon);
break;
}
case PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D :
@@ -177,7 +177,7 @@ namespace drawinglayer
// primitives who's BoundRect will be added in world coordinates
basegfx::B2DRange aRange(rCandidate.getB2DRange(getViewInformation2D()));
aRange.transform(getViewInformation2D().getObjectTransformation());
- maExtractedContour.push_back(basegfx::B2DPolyPolygon(basegfx::tools::createPolygonFromRect(aRange)));
+ maExtractedContour.emplace_back(basegfx::tools::createPolygonFromRect(aRange));
break;
}
default :
diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
index de194d520710..ca4169a664d4 100644
--- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
+++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
@@ -104,7 +104,7 @@ namespace drawinglayer
const basegfx::BColor aColor(maBColorModifierStack.getModifiedColor(rPoPoCoCandidate.getBColor()));
// add to result vector
- maTarget.push_back(TextAsPolygonDataNode(aPolyPolygon, aColor, true));
+ maTarget.emplace_back(aPolyPolygon, aColor, true);
}
}
@@ -126,7 +126,7 @@ namespace drawinglayer
const basegfx::BColor aColor(maBColorModifierStack.getModifiedColor(rPoHaCandidate.getBColor()));
// add to result vector
- maTarget.push_back(TextAsPolygonDataNode(basegfx::B2DPolyPolygon(aPolygon), aColor, false));
+ maTarget.emplace_back(basegfx::B2DPolyPolygon(aPolygon), aColor, false);
}
}
@@ -148,7 +148,7 @@ namespace drawinglayer
const basegfx::BColor aColor(maBColorModifierStack.getModifiedColor(rPoPoHaCandidate.getBColor()));
// add to result vector
- maTarget.push_back(TextAsPolygonDataNode(aPolyPolygon, aColor, false));
+ maTarget.emplace_back(aPolyPolygon, aColor, false);
}
}
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 125b154f90b0..127d88571d7e 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -213,7 +213,7 @@ namespace
OSL_ENSURE(aUsedFound != maUsedBuffers.end(), "OOps, non-registered buffer freed (!)");
maUsedBuffers.erase(aUsedFound);
- maFreeBuffers.push_back(&rDevice);
+ maFreeBuffers.emplace_back(&rDevice);
SAL_WARN_IF(maFreeBuffers.size() > 1000, "drawinglayer", "excessive cached buffers, "
<< maFreeBuffers.size() << " entries!");
Start();
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx b/drawinglayer/source/tools/emfphelperdata.cxx
index 3aaf19b60c30..fef6ca8a1b3c 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -550,7 +550,7 @@ namespace emfplushelper
aColor.setGreen( aStartColor.getGreen() * (1. - brush->blendFactors[i]) + aEndColor.getGreen() * brush->blendFactors[i] );
aColor.setBlue ( aStartColor.getBlue() * (1. - brush->blendFactors[i]) + aEndColor.getBlue() * brush->blendFactors[i] );
aColor.setRed ( aStartColor.getRed() * (1. - brush->blendFactors[i]) + aEndColor.getRed() * brush->blendFactors[i] );
- aVector.push_back( drawinglayer::primitive2d::SvgGradientEntry(aBlendPoint, aColor, 1.) );
+ aVector.emplace_back(aBlendPoint, aColor, 1. );
}
}
else if (brush->colorblendPositions)
@@ -572,20 +572,20 @@ namespace emfplushelper
aBlendPoint = 2. * ( 1. - brush->colorblendPositions [i] );
}
aColor = brush->colorblendColors[i].getBColor();
- aVector.push_back( drawinglayer::primitive2d::SvgGradientEntry(aBlendPoint, aColor, 1.) );
+ aVector.emplace_back(aBlendPoint, aColor, 1. );
}
}
else // ok, no extra points: just start and end
{
if (brush->type == BrushTypeLinearGradient)
{
- aVector.push_back( drawinglayer::primitive2d::SvgGradientEntry(0.0, aStartColor, 1.) );
- aVector.push_back( drawinglayer::primitive2d::SvgGradientEntry(1.0, aEndColor, 1.) );
+ aVector.emplace_back(0.0, aStartColor, 1. );
+ aVector.emplace_back(1.0, aEndColor, 1. );
}
else // again, here reverse
{
- aVector.push_back( drawinglayer::primitive2d::SvgGradientEntry(0.0, aEndColor, 1.) );
- aVector.push_back( drawinglayer::primitive2d::SvgGradientEntry(1.0, aStartColor, 1.) );
+ aVector.emplace_back(0.0, aEndColor, 1. );
+ aVector.emplace_back(1.0, aStartColor, 1. );
}
}
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 0bc3a518c838..39b39071b287 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -1520,7 +1520,7 @@ namespace wmfemfhelper
}
const Point& rPoint = pA->GetPoint();
- aPositions.push_back(basegfx::B2DPoint(rPoint.X(), rPoint.Y()));
+ aPositions.emplace_back(rPoint.X(), rPoint.Y());
nAction++; if(nAction < nCount) pAction = rMetaFile.GetAction(nAction);
}
@@ -1544,7 +1544,7 @@ namespace wmfemfhelper
{
const MetaPointAction* pA = static_cast<const MetaPointAction*>(pAction);
const Point& rPoint = pA->GetPoint();
- aPositions.push_back(basegfx::B2DPoint(rPoint.X(), rPoint.Y()));
+ aPositions.emplace_back(rPoint.X(), rPoint.Y());
nAction++; if(nAction < nCount) pAction = rMetaFile.GetAction(nAction);
}