summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-06-14 14:46:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-06-15 09:24:47 +0200
commitdcb36da2950ad967ad3f633ca12353da98ac620b (patch)
treec855b0c64b9ab4218d833749aa4b425bf5af749d /drawinglayer
parent2da1cdd31312a70f205f29bb4dfcbc1771409aa4 (diff)
clang-tidy modernize-pass-by-value in drawinglayer
Change-Id: I8a3245c6a4d687edbc95cf28b2932d80c86a7b65 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135828 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/inc/primitive2d/cropprimitive2d.hxx2
-rw-r--r--drawinglayer/inc/primitive2d/textlineprimitive2d.hxx2
-rw-r--r--drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx6
-rw-r--r--drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/primitive3d/shadowprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/primitive3d/textureprimitive3d.hxx2
-rw-r--r--drawinglayer/inc/processor3d/geometry2dextractor.hxx2
-rw-r--r--drawinglayer/inc/processor3d/shadow3dextractor.hxx2
-rw-r--r--drawinglayer/source/attribute/fillgraphicattribute.cxx5
-rw-r--r--drawinglayer/source/attribute/fontattribute.cxx11
-rw-r--r--drawinglayer/source/attribute/linestartendattribute.cxx5
-rw-r--r--drawinglayer/source/attribute/sdrallattribute3d.cxx21
-rw-r--r--drawinglayer/source/attribute/sdrfillattribute.cxx13
-rw-r--r--drawinglayer/source/attribute/sdrfillgraphicattribute.cxx5
-rw-r--r--drawinglayer/source/attribute/sdrlinestartendattribute.cxx9
-rw-r--r--drawinglayer/source/geometry/viewinformation2d.cxx13
-rw-r--r--drawinglayer/source/geometry/viewinformation3d.cxx17
-rw-r--r--drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx7
-rw-r--r--drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx14
-rw-r--r--drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx5
-rw-r--r--drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx7
-rw-r--r--drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx16
-rw-r--r--drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx10
-rw-r--r--drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx7
-rw-r--r--drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx13
-rw-r--r--drawinglayer/source/primitive2d/bitmapprimitive2d.cxx9
-rw-r--r--drawinglayer/source/primitive2d/borderlineprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/controlprimitive2d.cxx21
-rw-r--r--drawinglayer/source/primitive2d/cropprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx9
-rw-r--r--drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx13
-rw-r--r--drawinglayer/source/primitive2d/epsprimitive2d.cxx9
-rw-r--r--drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx9
-rw-r--r--drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx9
-rw-r--r--drawinglayer/source/primitive2d/graphicprimitive2d.cxx9
-rw-r--r--drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx7
-rw-r--r--drawinglayer/source/primitive2d/gridprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/maskprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/mediaprimitive2d.cxx13
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx13
-rw-r--r--drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx9
-rw-r--r--drawinglayer/source/primitive2d/patternfillprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/polygonprimitive2d.cxx23
-rw-r--r--drawinglayer/source/primitive2d/sceneprimitive2d.cxx21
-rw-r--r--drawinglayer/source/primitive2d/shadowprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/svggradientprimitive2d.cxx9
-rw-r--r--drawinglayer/source/primitive2d/textlineprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/textprimitive2d.cxx18
-rw-r--r--drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx13
-rw-r--r--drawinglayer/source/primitive2d/transformprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/groupprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/polygonprimitive3d.cxx13
-rw-r--r--drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/sdrprimitive3d.cxx9
-rw-r--r--drawinglayer/source/primitive3d/shadowprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/textureprimitive3d.cxx5
-rw-r--r--drawinglayer/source/primitive3d/transformprimitive3d.cxx5
-rw-r--r--drawinglayer/source/processor2d/baseprocessor2d.cxx5
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx6
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.hxx2
-rw-r--r--drawinglayer/source/processor3d/baseprocessor3d.cxx5
-rw-r--r--drawinglayer/source/processor3d/geometry2dextractor.cxx5
-rw-r--r--drawinglayer/source/processor3d/shadow3dextractor.cxx5
-rw-r--r--drawinglayer/source/processor3d/zbufferprocessor3d.cxx9
73 files changed, 322 insertions, 259 deletions
diff --git a/drawinglayer/inc/primitive2d/cropprimitive2d.hxx b/drawinglayer/inc/primitive2d/cropprimitive2d.hxx
index 3bed0638f254..e1c66cffab27 100644
--- a/drawinglayer/inc/primitive2d/cropprimitive2d.hxx
+++ b/drawinglayer/inc/primitive2d/cropprimitive2d.hxx
@@ -65,7 +65,7 @@ namespace drawinglayer::primitive2d
/// constructor
CropPrimitive2D(
Primitive2DContainer&& aChildren,
- const basegfx::B2DHomMatrix& rTransformation,
+ basegfx::B2DHomMatrix aTransformation,
double fCropLeft,
double fCropTop,
double fCropRight,
diff --git a/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx
index 423be7995879..e27364e7895b 100644
--- a/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx
+++ b/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
TextLinePrimitive2D(
- const basegfx::B2DHomMatrix& rObjectTransformation,
+ basegfx::B2DHomMatrix aObjectTransformation,
double fWidth,
double fOffset,
double fHeight,
diff --git a/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx
index 9b93e28dbe0d..516299198192 100644
--- a/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx
+++ b/drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx
@@ -42,7 +42,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
BaseTextStrikeoutPrimitive2D(
- const basegfx::B2DHomMatrix& rObjectTransformation,
+ basegfx::B2DHomMatrix aObjectTransformation,
double fWidth,
const basegfx::BColor& rFontColor);
@@ -77,8 +77,8 @@ namespace drawinglayer::primitive2d
double fWidth,
const basegfx::BColor& rFontColor,
sal_Unicode aStrikeoutChar,
- const attribute::FontAttribute& rFontAttribute,
- const css::lang::Locale& rLocale);
+ attribute::FontAttribute aFontAttribute,
+ css::lang::Locale aLocale);
/// data read access
sal_Unicode getStrikeoutChar() const { return maStrikeoutChar; }
diff --git a/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx
index 151fa67ea9da..a60c4da9d0a8 100644
--- a/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx
+++ b/drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx
@@ -49,7 +49,7 @@ namespace drawinglayer::primitive3d
public:
/// constructor
HatchTexturePrimitive3D(
- const attribute::FillHatchAttribute& rHatch,
+ attribute::FillHatchAttribute aHatch,
const Primitive3DContainer& rChildren,
const basegfx::B2DVector& rTextureSize,
bool bModulate,
diff --git a/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx
index 627d2b8c1b9b..06d4e9f49d77 100644
--- a/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx
+++ b/drawinglayer/inc/primitive3d/shadowprimitive3d.hxx
@@ -48,7 +48,7 @@ namespace drawinglayer::primitive3d
public:
/// constructor
ShadowPrimitive3D(
- const basegfx::B2DHomMatrix& rShadowTransform,
+ basegfx::B2DHomMatrix aShadowTransform,
const basegfx::BColor& rShadowColor,
double fShadowTransparence,
bool bShadow3D,
diff --git a/drawinglayer/inc/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/primitive3d/textureprimitive3d.hxx
index 855ee34363a3..56586217bdff 100644
--- a/drawinglayer/inc/primitive3d/textureprimitive3d.hxx
+++ b/drawinglayer/inc/primitive3d/textureprimitive3d.hxx
@@ -121,7 +121,7 @@ namespace drawinglayer::primitive3d
public:
/// constructor
GradientTexturePrimitive3D(
- const attribute::FillGradientAttribute& rGradient,
+ attribute::FillGradientAttribute aGradient,
const Primitive3DContainer& rChildren,
const basegfx::B2DVector& rTextureSize,
bool bModulate,
diff --git a/drawinglayer/inc/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/processor3d/geometry2dextractor.hxx
index e490ecfc538c..8d78110c8dcf 100644
--- a/drawinglayer/inc/processor3d/geometry2dextractor.hxx
+++ b/drawinglayer/inc/processor3d/geometry2dextractor.hxx
@@ -53,7 +53,7 @@ namespace drawinglayer::processor3d
public:
Geometry2DExtractingProcessor(
const geometry::ViewInformation3D& rViewInformation,
- const basegfx::B2DHomMatrix& rObjectTransformation);
+ basegfx::B2DHomMatrix aObjectTransformation);
// data read access
const primitive2d::Primitive2DContainer& getPrimitive2DSequence() const { return maPrimitive2DSequence; }
diff --git a/drawinglayer/inc/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/processor3d/shadow3dextractor.hxx
index 9fa877fec552..64890b7a630a 100644
--- a/drawinglayer/inc/processor3d/shadow3dextractor.hxx
+++ b/drawinglayer/inc/processor3d/shadow3dextractor.hxx
@@ -78,7 +78,7 @@ namespace drawinglayer::processor3d
public:
Shadow3DExtractingProcessor(
const geometry::ViewInformation3D& rViewInformation,
- const basegfx::B2DHomMatrix& rObjectTransformation,
+ basegfx::B2DHomMatrix aObjectTransformation,
const basegfx::B3DVector& rLightNormal,
double fShadowSlant,
const basegfx::B3DRange& rContained3DRange);
diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx b/drawinglayer/source/attribute/fillgraphicattribute.cxx
index b36520d4f981..300d6f6123f1 100644
--- a/drawinglayer/source/attribute/fillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx
@@ -22,6 +22,7 @@
#include <algorithm>
#include <drawinglayer/attribute/fillgraphicattribute.hxx>
+#include <utility>
#include <vcl/graph.hxx>
namespace drawinglayer::attribute
@@ -41,12 +42,12 @@ namespace drawinglayer::attribute
double mfOffsetY;
ImpFillGraphicAttribute(
- const Graphic& rGraphic,
+ Graphic aGraphic,
const basegfx::B2DRange& rGraphicRange,
bool bTiling,
double fOffsetX,
double fOffsetY)
- : maGraphic(rGraphic),
+ : maGraphic(std::move(aGraphic)),
maGraphicRange(rGraphicRange),
mbTiling(bTiling),
mfOffsetX(fOffsetX),
diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx
index 8ae3836d8aa7..c1f0ab000d86 100644
--- a/drawinglayer/source/attribute/fontattribute.cxx
+++ b/drawinglayer/source/attribute/fontattribute.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/attribute/fontattribute.hxx>
#include <rtl/ustring.hxx>
+#include <utility>
namespace drawinglayer::attribute
{
@@ -38,11 +39,11 @@ public:
bool mbBiDiStrong : 1; // BiDi Flag
bool mbMonospaced : 1;
- ImpFontAttribute(const OUString& rFamilyName, const OUString& rStyleName, sal_uInt16 nWeight,
- bool bSymbol, bool bVertical, bool bItalic, bool bMonospaced, bool bOutline,
- bool bRTL, bool bBiDiStrong)
- : maFamilyName(rFamilyName)
- , maStyleName(rStyleName)
+ ImpFontAttribute(OUString aFamilyName, OUString aStyleName, sal_uInt16 nWeight, bool bSymbol,
+ bool bVertical, bool bItalic, bool bMonospaced, bool bOutline, bool bRTL,
+ bool bBiDiStrong)
+ : maFamilyName(std::move(aFamilyName))
+ , maStyleName(std::move(aStyleName))
, mnWeight(nWeight)
, mbSymbol(bSymbol)
, mbVertical(bVertical)
diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx
index 57a680db377c..33ac17c70599 100644
--- a/drawinglayer/source/attribute/linestartendattribute.cxx
+++ b/drawinglayer/source/attribute/linestartendattribute.cxx
@@ -20,6 +20,7 @@
#include <drawinglayer/attribute/linestartendattribute.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <utility>
namespace drawinglayer::attribute
@@ -35,10 +36,10 @@ namespace drawinglayer::attribute
ImpLineStartEndAttribute(
double fWidth,
- const basegfx::B2DPolyPolygon& rPolyPolygon,
+ basegfx::B2DPolyPolygon aPolyPolygon,
bool bCentered)
: mfWidth(fWidth),
- maPolyPolygon(rPolyPolygon),
+ maPolyPolygon(std::move(aPolyPolygon)),
mbCentered(bCentered)
{
}
diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx
index 079f655796d9..8c74306ca1dd 100644
--- a/drawinglayer/source/attribute/sdrallattribute3d.cxx
+++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx
@@ -18,21 +18,22 @@
*/
#include <drawinglayer/attribute/sdrallattribute3d.hxx>
+#include <utility>
namespace drawinglayer::attribute
{
SdrLineFillShadowAttribute3D::SdrLineFillShadowAttribute3D(
- const SdrLineAttribute& rLine,
- const SdrFillAttribute& rFill,
- const SdrLineStartEndAttribute& rLineStartEnd,
- const SdrShadowAttribute& rShadow,
- const FillGradientAttribute& rFillFloatTransGradient)
- : maLine(rLine),
- maFill(rFill),
- maLineStartEnd(rLineStartEnd),
- maShadow(rShadow),
- maFillFloatTransGradient(rFillFloatTransGradient)
+ SdrLineAttribute aLine,
+ SdrFillAttribute aFill,
+ SdrLineStartEndAttribute aLineStartEnd,
+ SdrShadowAttribute aShadow,
+ FillGradientAttribute aFillFloatTransGradient)
+ : maLine(std::move(aLine)),
+ maFill(std::move(aFill)),
+ maLineStartEnd(std::move(aLineStartEnd)),
+ maShadow(std::move(aShadow)),
+ maFillFloatTransGradient(std::move(aFillFloatTransGradient))
{
}
diff --git a/drawinglayer/source/attribute/sdrfillattribute.cxx b/drawinglayer/source/attribute/sdrfillattribute.cxx
index b582ee0a11d0..1a4388ee4b30 100644
--- a/drawinglayer/source/attribute/sdrfillattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillattribute.cxx
@@ -22,6 +22,7 @@
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <drawinglayer/attribute/fillhatchattribute.hxx>
#include <drawinglayer/attribute/fillgradientattribute.hxx>
+#include <utility>
namespace drawinglayer::attribute
@@ -40,14 +41,14 @@ namespace drawinglayer::attribute
ImpSdrFillAttribute(
double fTransparence,
const basegfx::BColor& rColor,
- const FillGradientAttribute& rGradient,
- const FillHatchAttribute& rHatch,
- const SdrFillGraphicAttribute& rFillGraphic)
+ FillGradientAttribute aGradient,
+ FillHatchAttribute aHatch,
+ SdrFillGraphicAttribute aFillGraphic)
: mfTransparence(fTransparence),
maColor(rColor),
- maGradient(rGradient),
- maHatch(rHatch),
- maFillGraphic(rFillGraphic)
+ maGradient(std::move(aGradient)),
+ maHatch(std::move(aHatch)),
+ maFillGraphic(std::move(aFillGraphic))
{
}
diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
index 14f53cf03db3..b78f3e322c38 100644
--- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
+++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
@@ -23,6 +23,7 @@
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <drawinglayer/attribute/fillgraphicattribute.hxx>
+#include <utility>
#include <vcl/graph.hxx>
@@ -44,7 +45,7 @@ namespace drawinglayer::attribute
bool mbLogSize : 1;
ImpSdrFillGraphicAttribute(
- const Graphic& rFillGraphic,
+ Graphic aFillGraphic,
const basegfx::B2DVector& rGraphicLogicSize,
const basegfx::B2DVector& rSize,
const basegfx::B2DVector& rOffset,
@@ -53,7 +54,7 @@ namespace drawinglayer::attribute
bool bTiling,
bool bStretch,
bool bLogSize)
- : maFillGraphic(rFillGraphic),
+ : maFillGraphic(std::move(aFillGraphic)),
maGraphicLogicSize(rGraphicLogicSize),
maSize(rSize),
maOffset(rOffset),
diff --git a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
index aa052236cd72..911f8aef8bf5 100644
--- a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
+++ b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/attribute/sdrlinestartendattribute.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <utility>
namespace drawinglayer::attribute
@@ -38,16 +39,16 @@ namespace drawinglayer::attribute
bool mbEndCentered : 1; // Line is centered on line end point
ImpSdrLineStartEndAttribute(
- const basegfx::B2DPolyPolygon& rStartPolyPolygon,
- const basegfx::B2DPolyPolygon& rEndPolyPolygon,
+ basegfx::B2DPolyPolygon aStartPolyPolygon,
+ basegfx::B2DPolyPolygon aEndPolyPolygon,
double fStartWidth,
double fEndWidth,
bool bStartActive,
bool bEndActive,
bool bStartCentered,
bool bEndCentered)
- : maStartPolyPolygon(rStartPolyPolygon),
- maEndPolyPolygon(rEndPolyPolygon),
+ : maStartPolyPolygon(std::move(aStartPolyPolygon)),
+ maEndPolyPolygon(std::move(aEndPolyPolygon)),
mfStartWidth(fStartWidth),
mfEndWidth(fEndWidth),
mbStartActive(bStartActive),
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index bcd6f020f5a4..6de309286d9d 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/geometry/AffineMatrix2D.hpp>
#include <com/sun/star/geometry/RealRectangle2D.hpp>
+#include <utility>
using namespace com::sun::star;
@@ -76,15 +77,15 @@ protected:
bool mbReducedDisplayQuality : 1;
public:
- ImpViewInformation2D(const basegfx::B2DHomMatrix& rObjectTransformation,
- const basegfx::B2DHomMatrix& rViewTransformation,
+ ImpViewInformation2D(basegfx::B2DHomMatrix aObjectTransformation,
+ basegfx::B2DHomMatrix aViewTransformation,
const basegfx::B2DRange& rViewport,
- const uno::Reference<drawing::XDrawPage>& rxDrawPage, double fViewTime,
+ uno::Reference<drawing::XDrawPage> xDrawPage, double fViewTime,
bool bReducedDisplayQuality)
- : maObjectTransformation(rObjectTransformation)
- , maViewTransformation(rViewTransformation)
+ : maObjectTransformation(std::move(aObjectTransformation))
+ , maViewTransformation(std::move(aViewTransformation))
, maViewport(rViewport)
- , mxVisualizedPage(rxDrawPage)
+ , mxVisualizedPage(std::move(xDrawPage))
, mfViewTime(fViewTime)
, mbReducedDisplayQuality(bReducedDisplayQuality)
{
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index a2a444ab3543..1fb3344c8b00 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/geometry/AffineMatrix3D.hpp>
#include <basegfx/utils/canvastools.hxx>
#include <com/sun/star/uno/Sequence.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -210,16 +211,16 @@ namespace drawinglayer::geometry
public:
ImpViewInformation3D(
- const basegfx::B3DHomMatrix& rObjectTransformation,
- const basegfx::B3DHomMatrix& rOrientation,
- const basegfx::B3DHomMatrix& rProjection,
- const basegfx::B3DHomMatrix& rDeviceToView,
+ basegfx::B3DHomMatrix aObjectTransformation,
+ basegfx::B3DHomMatrix aOrientation,
+ basegfx::B3DHomMatrix aProjection,
+ basegfx::B3DHomMatrix aDeviceToView,
double fViewTime,
const uno::Sequence< beans::PropertyValue >& rExtendedParameters)
- : maObjectTransformation(rObjectTransformation),
- maOrientation(rOrientation),
- maProjection(rProjection),
- maDeviceToView(rDeviceToView),
+ : maObjectTransformation(std::move(aObjectTransformation)),
+ maOrientation(std::move(aOrientation)),
+ maProjection(std::move(aProjection)),
+ maDeviceToView(std::move(aDeviceToView)),
mfViewTime(fViewTime)
{
impInterpretPropertyValues(rExtendedParameters);
diff --git a/drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx
index b3aed429ba0c..ff5578104374 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx
@@ -21,14 +21,15 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <utility>
using namespace com::sun::star;
namespace drawinglayer::primitive2d
{
-PolyPolygonColorPrimitive2D::PolyPolygonColorPrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBColor)
- : maPolyPolygon(rPolyPolygon)
+PolyPolygonColorPrimitive2D::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon,
+ const basegfx::BColor& rBColor)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maBColor(rBColor)
{
}
diff --git a/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx
index 3e88b6c0ddb0..c6e700f28fe3 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx
@@ -23,6 +23,7 @@
#include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <rtl/ref.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -45,20 +46,19 @@ void PolyPolygonGradientPrimitive2D::create2DDecomposition(
}
PolyPolygonGradientPrimitive2D::PolyPolygonGradientPrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon,
- const attribute::FillGradientAttribute& rFillGradient)
+ const basegfx::B2DPolyPolygon& rPolyPolygon, attribute::FillGradientAttribute aFillGradient)
: maPolyPolygon(rPolyPolygon)
, maDefinitionRange(rPolyPolygon.getB2DRange())
- , maFillGradient(rFillGradient)
+ , maFillGradient(std::move(aFillGradient))
{
}
PolyPolygonGradientPrimitive2D::PolyPolygonGradientPrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DRange& rDefinitionRange,
- const attribute::FillGradientAttribute& rFillGradient)
- : maPolyPolygon(rPolyPolygon)
+ basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::B2DRange& rDefinitionRange,
+ attribute::FillGradientAttribute aFillGradient)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maDefinitionRange(rDefinitionRange)
- , maFillGradient(rFillGradient)
+ , maFillGradient(std::move(aFillGradient))
{
}
diff --git a/drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx
index a65d1d08a0f0..328e98896240 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx
@@ -24,6 +24,7 @@
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
+#include <utility>
#include <vcl/graph.hxx>
using namespace com::sun::star;
@@ -96,9 +97,9 @@ void PolyPolygonGraphicPrimitive2D::create2DDecomposition(
}
PolyPolygonGraphicPrimitive2D::PolyPolygonGraphicPrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DRange& rDefinitionRange,
+ basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::B2DRange& rDefinitionRange,
const attribute::FillGraphicAttribute& rFillGraphic)
- : maPolyPolygon(rPolyPolygon)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maDefinitionRange(rDefinitionRange)
, maFillGraphic(rFillGraphic)
{
diff --git a/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx
index 2bfed5fb1d9e..2e4dc1dfe9f6 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx
@@ -22,6 +22,7 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -43,9 +44,9 @@ void PolyPolygonHairlinePrimitive2D::create2DDecomposition(
}
}
-PolyPolygonHairlinePrimitive2D::PolyPolygonHairlinePrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBColor)
- : maPolyPolygon(rPolyPolygon)
+PolyPolygonHairlinePrimitive2D::PolyPolygonHairlinePrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon,
+ const basegfx::BColor& rBColor)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maBColor(rBColor)
{
}
diff --git a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
index 7fc0502c8f43..79fcd78cc99b 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
@@ -23,6 +23,7 @@
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx>
#include <rtl/ref.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -46,21 +47,22 @@ void PolyPolygonHatchPrimitive2D::create2DDecomposition(
PolyPolygonHatchPrimitive2D::PolyPolygonHatchPrimitive2D(
const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBackgroundColor,
- const attribute::FillHatchAttribute& rFillHatch)
+ attribute::FillHatchAttribute rFillHatch)
: maPolyPolygon(rPolyPolygon)
, maDefinitionRange(rPolyPolygon.getB2DRange())
, maBackgroundColor(rBackgroundColor)
- , maFillHatch(rFillHatch)
+ , maFillHatch(std::move(rFillHatch))
{
}
-PolyPolygonHatchPrimitive2D::PolyPolygonHatchPrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::B2DRange& rDefinitionRange,
- const basegfx::BColor& rBackgroundColor, const attribute::FillHatchAttribute& rFillHatch)
- : maPolyPolygon(rPolyPolygon)
+PolyPolygonHatchPrimitive2D::PolyPolygonHatchPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon,
+ const basegfx::B2DRange& rDefinitionRange,
+ const basegfx::BColor& rBackgroundColor,
+ attribute::FillHatchAttribute rFillHatch)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maDefinitionRange(rDefinitionRange)
, maBackgroundColor(rBackgroundColor)
- , maFillHatch(rFillHatch)
+ , maFillHatch(std::move(rFillHatch))
{
}
diff --git a/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx
index 4f9f83298bb3..b486b76b9724 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx
@@ -22,6 +22,7 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -44,10 +45,11 @@ void PolyPolygonMarkerPrimitive2D::create2DDecomposition(
}
}
-PolyPolygonMarkerPrimitive2D::PolyPolygonMarkerPrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rRGBColorA,
- const basegfx::BColor& rRGBColorB, double fDiscreteDashLength)
- : maPolyPolygon(rPolyPolygon)
+PolyPolygonMarkerPrimitive2D::PolyPolygonMarkerPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon,
+ const basegfx::BColor& rRGBColorA,
+ const basegfx::BColor& rRGBColorB,
+ double fDiscreteDashLength)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maRGBColorA(rRGBColorA)
, maRGBColorB(rRGBColorB)
, mfDiscreteDashLength(fDiscreteDashLength)
diff --git a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
index d5ed17980016..3da2116fc2a8 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx
@@ -25,6 +25,7 @@
#include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
#include <drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx>
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -70,9 +71,9 @@ void PolyPolygonSelectionPrimitive2D::create2DDecomposition(
}
PolyPolygonSelectionPrimitive2D::PolyPolygonSelectionPrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rColor,
- double fTransparence, double fDiscreteGrow, bool bFill)
- : maPolyPolygon(rPolyPolygon)
+ basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::BColor& rColor, double fTransparence,
+ double fDiscreteGrow, bool bFill)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maColor(rColor)
, mfTransparence(fTransparence)
, mfDiscreteGrow(fabs(fDiscreteGrow))
diff --git a/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx b/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx
index 7191f30851de..0b23c92bc606 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx
@@ -22,6 +22,7 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -44,17 +45,17 @@ void PolyPolygonStrokePrimitive2D::create2DDecomposition(
}
PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute,
- const attribute::StrokeAttribute& rStrokeAttribute)
- : maPolyPolygon(rPolyPolygon)
+ basegfx::B2DPolyPolygon aPolyPolygon, const attribute::LineAttribute& rLineAttribute,
+ attribute::StrokeAttribute aStrokeAttribute)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maLineAttribute(rLineAttribute)
- , maStrokeAttribute(rStrokeAttribute)
+ , maStrokeAttribute(std::move(aStrokeAttribute))
{
}
PolyPolygonStrokePrimitive2D::PolyPolygonStrokePrimitive2D(
- const basegfx::B2DPolyPolygon& rPolyPolygon, const attribute::LineAttribute& rLineAttribute)
- : maPolyPolygon(rPolyPolygon)
+ basegfx::B2DPolyPolygon aPolyPolygon, const attribute::LineAttribute& rLineAttribute)
+ : maPolyPolygon(std::move(aPolyPolygon))
, maLineAttribute(rLineAttribute)
{
}
diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
index 6f256b6e1850..519ad153696b 100644
--- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
@@ -20,15 +20,16 @@
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <com/sun/star/awt/XBitmap.hpp>
+#include <utility>
using namespace com::sun::star;
namespace drawinglayer::primitive2d
{
-BitmapPrimitive2D::BitmapPrimitive2D(const css::uno::Reference<css::awt::XBitmap>& rXBitmap,
- const basegfx::B2DHomMatrix& rTransform)
- : maXBitmap(rXBitmap)
- , maTransform(rTransform)
+BitmapPrimitive2D::BitmapPrimitive2D(css::uno::Reference<css::awt::XBitmap> xXBitmap,
+ basegfx::B2DHomMatrix aTransform)
+ : maXBitmap(std::move(xXBitmap))
+ , maTransform(std::move(aTransform))
{
}
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 7ede1f2c337a..56e9464c16ee 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -26,6 +26,7 @@
#include <rtl/math.hxx>
#include <algorithm>
+#include <utility>
namespace drawinglayer::primitive2d
@@ -266,11 +267,11 @@ namespace drawinglayer::primitive2d
const basegfx::B2DPoint& rStart,
const basegfx::B2DPoint& rEnd,
std::vector< BorderLine >&& rBorderLines,
- const drawinglayer::attribute::StrokeAttribute& rStrokeAttribute)
+ drawinglayer::attribute::StrokeAttribute aStrokeAttribute)
: maStart(rStart),
maEnd(rEnd),
maBorderLines(std::move(rBorderLines)),
- maStrokeAttribute(rStrokeAttribute)
+ maStrokeAttribute(std::move(aStrokeAttribute))
{
}
diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
index 461400dafb84..a90e7aaf7c0e 100644
--- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/awt/XControl.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <utility>
#include <vcl/virdev.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/awt/PosSize.hpp>
@@ -241,20 +242,20 @@ namespace drawinglayer::primitive2d
}
ControlPrimitive2D::ControlPrimitive2D(
- const basegfx::B2DHomMatrix& rTransform,
- const uno::Reference< awt::XControlModel >& rxControlModel)
- : maTransform(rTransform),
- mxControlModel(rxControlModel)
+ basegfx::B2DHomMatrix aTransform,
+ uno::Reference< awt::XControlModel > xControlModel)
+ : maTransform(std::move(aTransform)),
+ mxControlModel(std::move(xControlModel))
{
}
ControlPrimitive2D::ControlPrimitive2D(
- const basegfx::B2DHomMatrix& rTransform,
- const uno::Reference< awt::XControlModel >& rxControlModel,
- const uno::Reference< awt::XControl >& rxXControl)
- : maTransform(rTransform),
- mxControlModel(rxControlModel),
- mxXControl(rxXControl)
+ basegfx::B2DHomMatrix aTransform,
+ uno::Reference< awt::XControlModel > xControlModel,
+ uno::Reference< awt::XControl > xXControl)
+ : maTransform(std::move(aTransform)),
+ mxControlModel(std::move(xControlModel)),
+ mxXControl(std::move(xXControl))
{
}
diff --git a/drawinglayer/source/primitive2d/cropprimitive2d.cxx b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
index 76393ad05507..964cda1def46 100644
--- a/drawinglayer/source/primitive2d/cropprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -24,6 +24,7 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -33,13 +34,13 @@ namespace drawinglayer::primitive2d
{
CropPrimitive2D::CropPrimitive2D(
Primitive2DContainer&& aChildren,
- const basegfx::B2DHomMatrix& rTransformation,
+ basegfx::B2DHomMatrix aTransformation,
double fCropLeft,
double fCropTop,
double fCropRight,
double fCropBottom)
: GroupPrimitive2D(std::move(aChildren)),
- maTransformation(rTransformation),
+ maTransformation(std::move(aTransformation)),
mfCropLeft(fCropLeft),
mfCropTop(fCropTop),
mfCropRight(fCropRight),
diff --git a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
index 290d9d2d7ffd..e7e1279b5fce 100644
--- a/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx
@@ -25,6 +25,7 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <osl/diagnose.h>
#include <toolkit/helper/vclunohelper.hxx>
+#include <utility>
namespace drawinglayer::primitive2d
@@ -256,10 +257,10 @@ namespace drawinglayer::primitive2d
}
DiscreteShadowPrimitive2D::DiscreteShadowPrimitive2D(
- const basegfx::B2DHomMatrix& rTransform,
- const DiscreteShadow& rDiscreteShadow)
- : maTransform(rTransform),
- maDiscreteShadow(rDiscreteShadow)
+ basegfx::B2DHomMatrix aTransform,
+ DiscreteShadow aDiscreteShadow)
+ : maTransform(std::move(aTransform)),
+ maDiscreteShadow(std::move(aDiscreteShadow))
{
}
diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
index f072df0c33a7..bed0eb4914c0 100644
--- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
@@ -26,6 +26,7 @@
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/geometry/viewinformation3d.hxx>
#include <processor3d/shadow3dextractor.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -68,15 +69,15 @@ namespace drawinglayer::primitive2d
}
Embedded3DPrimitive2D::Embedded3DPrimitive2D(
- const primitive3d::Primitive3DContainer& rxChildren3D,
- const basegfx::B2DHomMatrix& rObjectTransformation,
- const geometry::ViewInformation3D& rViewInformation3D,
+ primitive3d::Primitive3DContainer aChildren3D,
+ basegfx::B2DHomMatrix aObjectTransformation,
+ geometry::ViewInformation3D aViewInformation3D,
const basegfx::B3DVector& rLightNormal,
double fShadowSlant,
const basegfx::B3DRange& rScene3DRange)
- : mxChildren3D(rxChildren3D),
- maObjectTransformation(rObjectTransformation),
- maViewInformation3D(rViewInformation3D),
+ : mxChildren3D(std::move(aChildren3D)),
+ maObjectTransformation(std::move(aObjectTransformation)),
+ maViewInformation3D(std::move(aViewInformation3D)),
maLightNormal(rLightNormal),
mfShadowSlant(fShadowSlant),
maScene3DRange(rScene3DRange),
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index 9e876dad5376..249bd3abaab1 100644
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
@@ -20,6 +20,7 @@
#include <drawinglayer/primitive2d/epsprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
+#include <utility>
namespace drawinglayer::primitive2d
{
@@ -41,11 +42,11 @@ namespace drawinglayer::primitive2d
}
EpsPrimitive2D::EpsPrimitive2D(
- const basegfx::B2DHomMatrix& rEpsTransform,
- const GfxLink& rGfxLink,
+ basegfx::B2DHomMatrix aEpsTransform,
+ GfxLink aGfxLink,
const GDIMetaFile& rMetaFile)
- : maEpsTransform(rEpsTransform),
- maGfxLink(rGfxLink),
+ : maEpsTransform(std::move(aEpsTransform)),
+ maGfxLink(std::move(aGfxLink)),
maMetaFile(rMetaFile)
{
}
diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
index 7baf93bf5292..7100bac03ee8 100644
--- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
@@ -23,6 +23,7 @@
#include <texture/texture.hxx>
#include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -286,20 +287,20 @@ namespace drawinglayer::primitive2d
FillGradientPrimitive2D::FillGradientPrimitive2D(
const basegfx::B2DRange& rOutputRange,
- const attribute::FillGradientAttribute& rFillGradient)
+ attribute::FillGradientAttribute aFillGradient)
: maOutputRange(rOutputRange),
maDefinitionRange(rOutputRange),
- maFillGradient(rFillGradient)
+ maFillGradient(std::move(aFillGradient))
{
}
FillGradientPrimitive2D::FillGradientPrimitive2D(
const basegfx::B2DRange& rOutputRange,
const basegfx::B2DRange& rDefinitionRange,
- const attribute::FillGradientAttribute& rFillGradient)
+ attribute::FillGradientAttribute aFillGradient)
: maOutputRange(rOutputRange),
maDefinitionRange(rDefinitionRange),
- maFillGradient(rFillGradient)
+ maFillGradient(std::move(aFillGradient))
{
}
diff --git a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
index 0f386eea29de..383d199f52b0 100644
--- a/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx
@@ -25,6 +25,7 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <primitive2d/graphicprimitivehelper2d.hxx>
+#include <utility>
#include <vcl/graph.hxx>
@@ -91,9 +92,9 @@ namespace drawinglayer::primitive2d
}
FillGraphicPrimitive2D::FillGraphicPrimitive2D(
- const basegfx::B2DHomMatrix& rTransformation,
+ basegfx::B2DHomMatrix aTransformation,
const attribute::FillGraphicAttribute& rFillGraphic)
- : maTransformation(rTransformation),
+ : maTransformation(std::move(aTransformation)),
maFillGraphic(rFillGraphic)
{
}
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 09a82bdd89ca..fdb949e6e4df 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -25,6 +25,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -130,10 +131,10 @@ namespace drawinglayer::primitive2d
FillHatchPrimitive2D::FillHatchPrimitive2D(
const basegfx::B2DRange& rOutputRange,
const basegfx::BColor& rBColor,
- const attribute::FillHatchAttribute& rFillHatch)
+ attribute::FillHatchAttribute aFillHatch)
: maOutputRange(rOutputRange),
maDefinitionRange(rOutputRange),
- maFillHatch(rFillHatch),
+ maFillHatch(std::move(aFillHatch)),
maBColor(rBColor)
{
}
@@ -142,10 +143,10 @@ namespace drawinglayer::primitive2d
const basegfx::B2DRange& rOutputRange,
const basegfx::B2DRange& rDefinitionRange,
const basegfx::BColor& rBColor,
- const attribute::FillHatchAttribute& rFillHatch)
+ attribute::FillHatchAttribute aFillHatch)
: maOutputRange(rOutputRange),
maDefinitionRange(rDefinitionRange),
- maFillHatch(rFillHatch),
+ maFillHatch(std::move(aFillHatch)),
maBColor(rBColor)
{
}
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index 4cd7a4963f9d..b33abde57867 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -27,6 +27,7 @@
#include <primitive2d/graphicprimitivehelper2d.hxx>
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <utility>
namespace drawinglayer::primitive2d
{
@@ -170,18 +171,18 @@ void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer,
rContainer.append(std::move(aRetval));
}
-GraphicPrimitive2D::GraphicPrimitive2D(const basegfx::B2DHomMatrix& rTransform,
+GraphicPrimitive2D::GraphicPrimitive2D(basegfx::B2DHomMatrix aTransform,
const GraphicObject& rGraphicObject,
const GraphicAttr& rGraphicAttr)
- : maTransform(rTransform)
+ : maTransform(std::move(aTransform))
, maGraphicObject(rGraphicObject)
, maGraphicAttr(rGraphicAttr)
{
}
-GraphicPrimitive2D::GraphicPrimitive2D(const basegfx::B2DHomMatrix& rTransform,
+GraphicPrimitive2D::GraphicPrimitive2D(basegfx::B2DHomMatrix aTransform,
const GraphicObject& rGraphicObject)
- : maTransform(rTransform)
+ : maTransform(std::move(aTransform))
, maGraphicObject(rGraphicObject)
{
}
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index c79af14dd673..e3a4ac764e32 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -36,6 +36,7 @@
// helper class for animated graphics
+#include <utility>
#include <vcl/animate/Animation.hxx>
#include <vcl/graph.hxx>
#include <vcl/virdev.hxx>
@@ -342,7 +343,7 @@ namespace drawinglayer::primitive2d
/// constructor
AnimatedGraphicPrimitive2D(
const Graphic& rGraphic,
- const basegfx::B2DHomMatrix& rTransform);
+ basegfx::B2DHomMatrix aTransform);
/// data read access
const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
@@ -358,12 +359,12 @@ namespace drawinglayer::primitive2d
AnimatedGraphicPrimitive2D::AnimatedGraphicPrimitive2D(
const Graphic& rGraphic,
- const basegfx::B2DHomMatrix& rTransform)
+ basegfx::B2DHomMatrix aTransform)
: AnimatedSwitchPrimitive2D(
animation::AnimationEntryList(),
Primitive2DContainer(),
false),
- maTransform(rTransform),
+ maTransform(std::move(aTransform)),
maGraphic(rGraphic),
maAnimation(rGraphic.GetAnimation()),
maVirtualDevice(*Application::GetDefaultDevice()),
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index ddb468e9ad39..b43d05486dac 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -23,6 +23,7 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -250,7 +251,7 @@ namespace drawinglayer::primitive2d
}
GridPrimitive2D::GridPrimitive2D(
- const basegfx::B2DHomMatrix& rTransform,
+ basegfx::B2DHomMatrix aTransform,
double fWidth,
double fHeight,
double fSmallestViewDistance,
@@ -259,7 +260,7 @@ namespace drawinglayer::primitive2d
sal_uInt32 nSubdivisionsY,
const basegfx::BColor& rBColor,
const BitmapEx& rCrossMarker)
- : maTransform(rTransform),
+ : maTransform(std::move(aTransform)),
mfWidth(fWidth),
mfHeight(fHeight),
mfSmallestViewDistance(fSmallestViewDistance),
diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
index 842085168827..630548861a90 100644
--- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -27,10 +28,10 @@ using namespace com::sun::star;
namespace drawinglayer::primitive2d
{
MaskPrimitive2D::MaskPrimitive2D(
- const basegfx::B2DPolyPolygon& rMask,
+ basegfx::B2DPolyPolygon aMask,
Primitive2DContainer&& aChildren)
: GroupPrimitive2D(std::move(aChildren)),
- maMask(rMask)
+ maMask(std::move(aMask))
{
}
diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
index e097d2d98ae7..124db4133cff 100644
--- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx
@@ -21,6 +21,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
+#include <utility>
#include <vcl/GraphicObject.hxx>
#include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
@@ -91,16 +92,16 @@ namespace drawinglayer::primitive2d
}
MediaPrimitive2D::MediaPrimitive2D(
- const basegfx::B2DHomMatrix& rTransform,
- const OUString& rURL,
+ basegfx::B2DHomMatrix aTransform,
+ OUString aURL,
const basegfx::BColor& rBackgroundColor,
sal_uInt32 nDiscreteBorder,
- const Graphic &rSnapshot)
- : maTransform(rTransform),
- maURL(rURL),
+ Graphic aSnapshot)
+ : maTransform(std::move(aTransform)),
+ maURL(std::move(aURL)),
maBackgroundColor(rBackgroundColor),
mnDiscreteBorder(nDiscreteBorder),
- maSnapshot(rSnapshot)
+ maSnapshot(std::move(aSnapshot))
{
}
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 608be0bbc6b1..be17e620de40 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -18,6 +18,7 @@
*/
#include <drawinglayer/primitive2d/metafileprimitive2d.hxx>
+#include <utility>
#include <wmfemfhelper.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
@@ -86,9 +87,9 @@ namespace drawinglayer::primitive2d
}
MetafilePrimitive2D::MetafilePrimitive2D(
- const basegfx::B2DHomMatrix& rMetaFileTransform,
+ basegfx::B2DHomMatrix aMetaFileTransform,
const GDIMetaFile& rMetaFile)
- : maMetaFileTransform(rMetaFileTransform),
+ : maMetaFileTransform(std::move(aMetaFileTransform)),
maMetaFile(rMetaFile)
{
}
diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
index 2d0f572dad39..9786f9164e7f 100644
--- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -28,9 +29,9 @@ namespace drawinglayer::primitive2d
{
ModifiedColorPrimitive2D::ModifiedColorPrimitive2D(
Primitive2DContainer&& aChildren,
- const basegfx::BColorModifierSharedPtr& rColorModifier)
+ basegfx::BColorModifierSharedPtr xColorModifier)
: GroupPrimitive2D(std::move(aChildren)),
- maColorModifier(rColorModifier)
+ maColorModifier(std::move(xColorModifier))
{
}
diff --git a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
index 577f3171a3dd..0c91957766a4 100644
--- a/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx
@@ -18,6 +18,7 @@
*/
#include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -25,13 +26,13 @@ namespace drawinglayer::primitive2d
{
ObjectInfoPrimitive2D::ObjectInfoPrimitive2D(
Primitive2DContainer&& aChildren,
- const OUString& rName,
- const OUString& rTitle,
- const OUString& rDesc)
+ OUString aName,
+ OUString aTitle,
+ OUString aDesc)
: GroupPrimitive2D(std::move(aChildren)),
- maName(rName),
- maTitle(rTitle),
- maDesc(rDesc)
+ maName(std::move(aName)),
+ maTitle(std::move(aTitle)),
+ maDesc(std::move(aDesc))
{
}
diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
index 7aa1a440555e..7e274e78e9c1 100644
--- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx
@@ -24,6 +24,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -101,14 +102,14 @@ namespace drawinglayer::primitive2d
}
PagePreviewPrimitive2D::PagePreviewPrimitive2D(
- const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage,
- const basegfx::B2DHomMatrix& rTransform,
+ css::uno::Reference< css::drawing::XDrawPage > xDrawPage,
+ basegfx::B2DHomMatrix aTransform,
double fContentWidth,
double fContentHeight,
Primitive2DContainer&& rPageContent)
- : mxDrawPage(rxDrawPage),
+ : mxDrawPage(std::move(xDrawPage)),
maPageContent(std::move(rPageContent)),
- maTransform(rTransform),
+ maTransform(std::move(aTransform)),
mfContentWidth(fContentWidth),
mfContentHeight(fContentHeight)
{
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index b667545b5347..ed1789be0924 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -29,6 +29,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <drawinglayer/converters.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -261,10 +262,10 @@ namespace drawinglayer::primitive2d
}
PatternFillPrimitive2D::PatternFillPrimitive2D(
- const basegfx::B2DPolyPolygon& rMask,
+ basegfx::B2DPolyPolygon aMask,
Primitive2DContainer&& rChildren,
const basegfx::B2DRange& rReferenceRange)
- : maMask(rMask),
+ : maMask(std::move(aMask)),
maChildren(std::move(rChildren)),
maReferenceRange(rReferenceRange),
mnDiscreteWidth(0),
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 1cbde11ae96b..d407556a2143 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -28,14 +28,15 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <basegfx/polygon/b2dlinegeometry.hxx>
#include <com/sun/star/drawing/LineCap.hpp>
+#include <utility>
using namespace com::sun::star;
namespace drawinglayer::primitive2d
{
-PolygonHairlinePrimitive2D::PolygonHairlinePrimitive2D(const basegfx::B2DPolygon& rPolygon,
+PolygonHairlinePrimitive2D::PolygonHairlinePrimitive2D(basegfx::B2DPolygon aPolygon,
const basegfx::BColor& rBColor)
- : maPolygon(rPolygon)
+ : maPolygon(std::move(aPolygon))
, maBColor(rBColor)
{
}
@@ -112,11 +113,11 @@ void PolygonMarkerPrimitive2D::create2DDecomposition(
}
}
-PolygonMarkerPrimitive2D::PolygonMarkerPrimitive2D(const basegfx::B2DPolygon& rPolygon,
+PolygonMarkerPrimitive2D::PolygonMarkerPrimitive2D(basegfx::B2DPolygon aPolygon,
const basegfx::BColor& rRGBColorA,
const basegfx::BColor& rRGBColorB,
double fDiscreteDashLength)
- : maPolygon(rPolygon)
+ : maPolygon(std::move(aPolygon))
, maRGBColorA(rRGBColorA)
, maRGBColorB(rRGBColorB)
, mfDiscreteDashLength(fDiscreteDashLength)
@@ -268,12 +269,12 @@ void PolygonStrokePrimitive2D::create2DDecomposition(
}
}
-PolygonStrokePrimitive2D::PolygonStrokePrimitive2D(
- const basegfx::B2DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute,
- const attribute::StrokeAttribute& rStrokeAttribute)
- : maPolygon(rPolygon)
+PolygonStrokePrimitive2D::PolygonStrokePrimitive2D(basegfx::B2DPolygon aPolygon,
+ const attribute::LineAttribute& rLineAttribute,
+ attribute::StrokeAttribute aStrokeAttribute)
+ : maPolygon(std::move(aPolygon))
, maLineAttribute(rLineAttribute)
- , maStrokeAttribute(rStrokeAttribute)
+ , maStrokeAttribute(std::move(aStrokeAttribute))
{
// MM01: keep these - these are no curve-decompposers but just checks
// simplify curve segments: moved here to not need to use it
@@ -281,9 +282,9 @@ PolygonStrokePrimitive2D::PolygonStrokePrimitive2D(
maPolygon = basegfx::utils::simplifyCurveSegments(maPolygon);
}
-PolygonStrokePrimitive2D::PolygonStrokePrimitive2D(const basegfx::B2DPolygon& rPolygon,
+PolygonStrokePrimitive2D::PolygonStrokePrimitive2D(basegfx::B2DPolygon aPolygon,
const attribute::LineAttribute& rLineAttribute)
- : maPolygon(rPolygon)
+ : maPolygon(std::move(aPolygon))
, maLineAttribute(rLineAttribute)
{
// MM01: keep these - these are no curve-decompposers but just checks
diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
index 0bec2258d69f..2ad2a401aae7 100644
--- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx
@@ -31,6 +31,7 @@
#include <svtools/optionsdrawinglayer.hxx>
#include <processor3d/geometry2dextractor.hxx>
#include <basegfx/raster/bzpixelraster.hxx>
+#include <utility>
#include <vcl/BitmapTools.hxx>
#include <comphelper/threadpool.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -561,16 +562,16 @@ namespace drawinglayer::primitive2d
}
ScenePrimitive2D::ScenePrimitive2D(
- const primitive3d::Primitive3DContainer& rxChildren3D,
- const attribute::SdrSceneAttribute& rSdrSceneAttribute,
- const attribute::SdrLightingAttribute& rSdrLightingAttribute,
- const basegfx::B2DHomMatrix& rObjectTransformation,
- const geometry::ViewInformation3D& rViewInformation3D)
- : mxChildren3D(rxChildren3D),
- maSdrSceneAttribute(rSdrSceneAttribute),
- maSdrLightingAttribute(rSdrLightingAttribute),
- maObjectTransformation(rObjectTransformation),
- maViewInformation3D(rViewInformation3D),
+ primitive3d::Primitive3DContainer aChildren3D,
+ attribute::SdrSceneAttribute aSdrSceneAttribute,
+ attribute::SdrLightingAttribute aSdrLightingAttribute,
+ basegfx::B2DHomMatrix aObjectTransformation,
+ geometry::ViewInformation3D aViewInformation3D)
+ : mxChildren3D(std::move(aChildren3D)),
+ maSdrSceneAttribute(std::move(aSdrSceneAttribute)),
+ maSdrLightingAttribute(std::move(aSdrLightingAttribute)),
+ maObjectTransformation(std::move(aObjectTransformation)),
+ maViewInformation3D(std::move(aViewInformation3D)),
mbShadow3DChecked(false),
mfOldDiscreteSizeX(0.0),
mfOldDiscreteSizeY(0.0)
diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
index 758aca3d2f35..15deebfb2a1e 100644
--- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx
@@ -24,6 +24,7 @@
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <memory>
+#include <utility>
using namespace com::sun::star;
@@ -31,12 +32,12 @@ using namespace com::sun::star;
namespace drawinglayer::primitive2d
{
ShadowPrimitive2D::ShadowPrimitive2D(
- const basegfx::B2DHomMatrix& rShadowTransform,
+ basegfx::B2DHomMatrix aShadowTransform,
const basegfx::BColor& rShadowColor,
double fShadowBlur,
Primitive2DContainer&& aChildren)
: GroupPrimitive2D(std::move(aChildren)),
- maShadowTransform(rShadowTransform),
+ maShadowTransform(std::move(aShadowTransform)),
maShadowColor(rShadowColor),
mfShadowBlur(fShadowBlur)
{
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 6b49c4b49d7e..25ee2fd543a0 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -31,6 +31,7 @@
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <cmath>
+#include <utility>
#include <vcl/skia/SkiaHelper.hxx>
using namespace com::sun::star;
@@ -342,14 +343,14 @@ namespace drawinglayer::primitive2d
}
SvgGradientHelper::SvgGradientHelper(
- const basegfx::B2DHomMatrix& rGradientTransform,
- const basegfx::B2DPolyPolygon& rPolyPolygon,
+ basegfx::B2DHomMatrix aGradientTransform,
+ basegfx::B2DPolyPolygon aPolyPolygon,
SvgGradientEntryVector&& rGradientEntries,
const basegfx::B2DPoint& rStart,
bool bUseUnitCoordinates,
SpreadMethod aSpreadMethod)
- : maGradientTransform(rGradientTransform),
- maPolyPolygon(rPolyPolygon),
+ : maGradientTransform(std::move(aGradientTransform)),
+ maPolyPolygon(std::move(aPolyPolygon)),
maGradientEntries(std::move(rGradientEntries)),
maStart(rStart),
maSpreadMethod(aSpreadMethod),
diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
index 461a83d756b5..958a95653b7a 100644
--- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx
@@ -24,6 +24,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <drawinglayer/primitive2d/PolygonWavePrimitive2D.hxx>
+#include <utility>
namespace drawinglayer::primitive2d
@@ -247,13 +248,13 @@ namespace drawinglayer::primitive2d
}
TextLinePrimitive2D::TextLinePrimitive2D(
- const basegfx::B2DHomMatrix& rObjectTransformation,
+ basegfx::B2DHomMatrix aObjectTransformation,
double fWidth,
double fOffset,
double fHeight,
TextLine eTextLine,
const basegfx::BColor& rLineColor)
- : maObjectTransformation(rObjectTransformation),
+ : maObjectTransformation(std::move(aObjectTransformation)),
mfWidth(fWidth),
mfOffset(fOffset),
mfHeight(fHeight),
diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx
index 00135a3aa623..6330c89b9184 100644
--- a/drawinglayer/source/primitive2d/textprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx
@@ -24,6 +24,7 @@
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <primitive2d/texteffectprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <utility>
#include <osl/diagnose.h>
using namespace com::sun::star;
@@ -200,18 +201,17 @@ void TextSimplePortionPrimitive2D::create2DDecomposition(
}
TextSimplePortionPrimitive2D::TextSimplePortionPrimitive2D(
- const basegfx::B2DHomMatrix& rNewTransform, const OUString& rText, sal_Int32 nTextPosition,
- sal_Int32 nTextLength, std::vector<double>&& rDXArray,
- const attribute::FontAttribute& rFontAttribute, const css::lang::Locale& rLocale,
- const basegfx::BColor& rFontColor, bool bFilled, tools::Long nWidthToFill,
- const Color& rTextFillColor)
- : maTextTransform(rNewTransform)
- , maText(rText)
+ basegfx::B2DHomMatrix rNewTransform, OUString rText, sal_Int32 nTextPosition,
+ sal_Int32 nTextLength, std::vector<double>&& rDXArray, attribute::FontAttribute aFontAttribute,
+ css::lang::Locale aLocale, const basegfx::BColor& rFontColor, bool bFilled,
+ tools::Long nWidthToFill, const Color& rTextFillColor)
+ : maTextTransform(std::move(rNewTransform))
+ , maText(std::move(rText))
, mnTextPosition(nTextPosition)
, mnTextLength(nTextLength)
, maDXArray(std::move(rDXArray))
- , maFontAttribute(rFontAttribute)
- , maLocale(rLocale)
+ , maFontAttribute(std::move(aFontAttribute))
+ , maLocale(std::move(aLocale))
, maFontColor(rFontColor)
, mbFilled(bFilled)
, mnWidthToFill(nWidthToFill)
diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
index ecd66b7a840e..20a3c23310d8 100644
--- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx
@@ -28,15 +28,16 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
+#include <utility>
namespace drawinglayer::primitive2d
{
BaseTextStrikeoutPrimitive2D::BaseTextStrikeoutPrimitive2D(
- const basegfx::B2DHomMatrix& rObjectTransformation,
+ basegfx::B2DHomMatrix aObjectTransformation,
double fWidth,
const basegfx::BColor& rFontColor)
- : maObjectTransformation(rObjectTransformation),
+ : maObjectTransformation(std::move(aObjectTransformation)),
mfWidth(fWidth),
maFontColor(rFontColor)
{
@@ -106,12 +107,12 @@ namespace drawinglayer::primitive2d
double fWidth,
const basegfx::BColor& rFontColor,
sal_Unicode aStrikeoutChar,
- const attribute::FontAttribute& rFontAttribute,
- const css::lang::Locale& rLocale)
+ attribute::FontAttribute aFontAttribute,
+ css::lang::Locale aLocale)
: BaseTextStrikeoutPrimitive2D(rObjectTransformation, fWidth, rFontColor),
maStrikeoutChar(aStrikeoutChar),
- maFontAttribute(rFontAttribute),
- maLocale(rLocale)
+ maFontAttribute(std::move(aFontAttribute)),
+ maLocale(std::move(aLocale))
{
}
diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
index ddd1594e270e..0442cd68aa62 100644
--- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -27,10 +28,10 @@ using namespace com::sun::star;
namespace drawinglayer::primitive2d
{
TransformPrimitive2D::TransformPrimitive2D(
- const basegfx::B2DHomMatrix& rTransformation,
+ basegfx::B2DHomMatrix aTransformation,
Primitive2DContainer&& aChildren)
: GroupPrimitive2D(std::move(aChildren)),
- maTransformation(rTransformation)
+ maTransformation(std::move(aTransformation))
{
}
diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
index 5249cdfb3ca2..8ce5948d969a 100644
--- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx
@@ -22,6 +22,7 @@
#include <drawinglayer/primitive2d/PolygonWavePrimitive2D.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
#include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <utility>
namespace drawinglayer::primitive2d
@@ -68,11 +69,11 @@ namespace drawinglayer::primitive2d
}
WrongSpellPrimitive2D::WrongSpellPrimitive2D(
- const basegfx::B2DHomMatrix& rTransformation,
+ basegfx::B2DHomMatrix aTransformation,
double fStart,
double fStop,
const basegfx::BColor& rColor)
- : maTransformation(rTransformation),
+ : maTransformation(std::move(aTransformation)),
mfStart(fStart),
mfStop(fStop),
maColor(rColor)
diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
index 69291e76872e..0b62c31dbb4e 100644
--- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/primitive3d/groupprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -26,8 +27,8 @@ using namespace com::sun::star;
namespace drawinglayer::primitive3d
{
- GroupPrimitive3D::GroupPrimitive3D( const Primitive3DContainer& rChildren )
- : maChildren(rChildren)
+ GroupPrimitive3D::GroupPrimitive3D( Primitive3DContainer aChildren )
+ : maChildren(std::move(aChildren))
{
}
diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
index a699f71706bb..668f7dab4439 100644
--- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx
@@ -29,6 +29,7 @@
#include <basegfx/matrix/b3dhommatrix.hxx>
#include <drawinglayer/primitive3d/polygonprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -267,13 +268,13 @@ namespace drawinglayer::primitive3d
}
HatchTexturePrimitive3D::HatchTexturePrimitive3D(
- const attribute::FillHatchAttribute& rHatch,
+ attribute::FillHatchAttribute aHatch,
const Primitive3DContainer& rChildren,
const basegfx::B2DVector& rTextureSize,
bool bModulate,
bool bFilter)
: TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter),
- maHatch(rHatch)
+ maHatch(std::move(aHatch))
{
}
diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
index 255f0235c911..54fa166f055d 100644
--- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -28,9 +29,9 @@ namespace drawinglayer::primitive3d
{
ModifiedColorPrimitive3D::ModifiedColorPrimitive3D(
const Primitive3DContainer& rChildren,
- const basegfx::BColorModifierSharedPtr& rColorModifier)
+ basegfx::BColorModifierSharedPtr xColorModifier)
: GroupPrimitive3D(rChildren),
- maColorModifier(rColorModifier)
+ maColorModifier(std::move(xColorModifier))
{
}
diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
index 8fc2b4d31298..6127ac77666b 100644
--- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
@@ -22,6 +22,7 @@
#include <basegfx/polygon/b3dpolypolygon.hxx>
#include <primitive3d/polygontubeprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -30,9 +31,9 @@ using namespace com::sun::star;
namespace drawinglayer::primitive3d
{
PolygonHairlinePrimitive3D::PolygonHairlinePrimitive3D(
- const basegfx::B3DPolygon& rPolygon,
+ basegfx::B3DPolygon aPolygon,
const basegfx::BColor& rBColor)
- : maPolygon(rPolygon),
+ : maPolygon(std::move(aPolygon)),
maBColor(rBColor)
{
}
@@ -117,12 +118,12 @@ namespace drawinglayer::primitive3d
}
PolygonStrokePrimitive3D::PolygonStrokePrimitive3D(
- const basegfx::B3DPolygon& rPolygon,
+ basegfx::B3DPolygon aPolygon,
const attribute::LineAttribute& rLineAttribute,
- const attribute::StrokeAttribute& rStrokeAttribute)
- : maPolygon(rPolygon),
+ attribute::StrokeAttribute aStrokeAttribute)
+ : maPolygon(std::move(aPolygon)),
maLineAttribute(rLineAttribute),
- maStrokeAttribute(rStrokeAttribute)
+ maStrokeAttribute(std::move(aStrokeAttribute))
{
}
diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
index 41e62b611405..09c8fb515933 100644
--- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx
@@ -20,6 +20,7 @@
#include <drawinglayer/primitive3d/polypolygonprimitive3d.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -28,10 +29,10 @@ using namespace com::sun::star;
namespace drawinglayer::primitive3d
{
PolyPolygonMaterialPrimitive3D::PolyPolygonMaterialPrimitive3D(
- const basegfx::B3DPolyPolygon& rPolyPolygon,
+ basegfx::B3DPolyPolygon aPolyPolygon,
const attribute::MaterialAttribute3D& rMaterial,
bool bDoubleSided)
- : maPolyPolygon(rPolyPolygon),
+ : maPolyPolygon(std::move(aPolyPolygon)),
maMaterial(rMaterial),
mbDoubleSided(bDoubleSided)
{
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 919fbcf5ab4a..e223b7911185 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -30,6 +30,7 @@
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <drawinglayer/attribute/sdrlineattribute.hxx>
#include <drawinglayer/attribute/sdrshadowattribute.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -388,7 +389,7 @@ namespace drawinglayer::primitive3d
const basegfx::B2DVector& rTextureSize,
const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute,
const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute,
- const basegfx::B2DPolyPolygon& rPolyPolygon,
+ basegfx::B2DPolyPolygon aPolyPolygon,
double fDepth,
double fDiagonal,
double fBackScale,
@@ -398,7 +399,7 @@ namespace drawinglayer::primitive3d
bool bCloseFront,
bool bCloseBack)
: SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute),
- maPolyPolygon(rPolyPolygon),
+ maPolyPolygon(std::move(aPolyPolygon)),
mfDepth(fDepth),
mfDiagonal(fDiagonal),
mfBackScale(fBackScale),
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 2115ebc3abe7..49011f10a74a 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -26,6 +26,7 @@
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <drawinglayer/attribute/sdrlineattribute.hxx>
#include <drawinglayer/attribute/sdrshadowattribute.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -240,7 +241,7 @@ namespace drawinglayer::primitive3d
const basegfx::B2DVector& rTextureSize,
const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute,
const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute,
- const basegfx::B2DPolyPolygon& rPolyPolygon,
+ basegfx::B2DPolyPolygon aPolyPolygon,
sal_uInt32 nHorizontalSegments,
sal_uInt32 nVerticalSegments,
double fDiagonal,
@@ -252,7 +253,7 @@ namespace drawinglayer::primitive3d
bool bCloseFront,
bool bCloseBack)
: SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute),
- maPolyPolygon(rPolyPolygon),
+ maPolyPolygon(std::move(aPolyPolygon)),
mnHorizontalSegments(nHorizontalSegments),
mnVerticalSegments(nVerticalSegments),
mfDiagonal(fDiagonal),
diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
index 010083b42291..9219cc970c86 100644
--- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx
@@ -24,6 +24,7 @@
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <drawinglayer/attribute/sdrlineattribute.hxx>
#include <drawinglayer/attribute/sdrshadowattribute.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -117,13 +118,13 @@ namespace drawinglayer::primitive3d
}
SdrPolyPolygonPrimitive3D::SdrPolyPolygonPrimitive3D(
- const basegfx::B3DPolyPolygon& rPolyPolygon3D,
+ basegfx::B3DPolyPolygon aPolyPolygon3D,
const basegfx::B3DHomMatrix& rTransform,
const basegfx::B2DVector& rTextureSize,
const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute,
const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute)
: SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute),
- maPolyPolygon3D(rPolyPolygon3D)
+ maPolyPolygon3D(std::move(aPolyPolygon3D))
{
}
diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
index 54fd2cf4b206..b4007f1a8705 100644
--- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx
@@ -20,6 +20,7 @@
#include <drawinglayer/primitive3d/sdrprimitive3d.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
#include <drawinglayer/attribute/sdrlineattribute.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -75,13 +76,13 @@ namespace drawinglayer::primitive3d
}
SdrPrimitive3D::SdrPrimitive3D(
- const basegfx::B3DHomMatrix& rTransform,
+ basegfx::B3DHomMatrix aTransform,
const basegfx::B2DVector& rTextureSize,
- const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute,
+ attribute::SdrLineFillShadowAttribute3D aSdrLFSAttribute,
const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute)
- : maTransform(rTransform),
+ : maTransform(std::move(aTransform)),
maTextureSize(rTextureSize),
- maSdrLFSAttribute(rSdrLFSAttribute),
+ maSdrLFSAttribute(std::move(aSdrLFSAttribute)),
maSdr3DObjectAttribute(rSdr3DObjectAttribute)
{
}
diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
index cca2e3c6f07f..3c3a07ef7a2f 100644
--- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx
@@ -19,6 +19,7 @@
#include <primitive3d/shadowprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -27,13 +28,13 @@ using namespace com::sun::star;
namespace drawinglayer::primitive3d
{
ShadowPrimitive3D::ShadowPrimitive3D(
- const basegfx::B2DHomMatrix& rShadowTransform,
+ basegfx::B2DHomMatrix aShadowTransform,
const basegfx::BColor& rShadowColor,
double fShadowTransparence,
bool bShadow3D,
const Primitive3DContainer& rChildren)
: GroupPrimitive3D(rChildren),
- maShadowTransform(rShadowTransform),
+ maShadowTransform(std::move(aShadowTransform)),
maShadowColor(rShadowColor),
mfShadowTransparence(fShadowTransparence),
mbShadow3D(bShadow3D)
diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
index 7c9226bf40de..ba998c7f50bb 100644
--- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx
@@ -20,6 +20,7 @@
#include <primitive3d/textureprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
#include <basegfx/color/bcolor.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -108,13 +109,13 @@ namespace drawinglayer::primitive3d
GradientTexturePrimitive3D::GradientTexturePrimitive3D(
- const attribute::FillGradientAttribute& rGradient,
+ attribute::FillGradientAttribute aGradient,
const Primitive3DContainer& rChildren,
const basegfx::B2DVector& rTextureSize,
bool bModulate,
bool bFilter)
: TexturePrimitive3D(rChildren, rTextureSize, bModulate, bFilter),
- maGradient(rGradient)
+ maGradient(std::move(aGradient))
{
}
diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
index 1ddb919bf2e1..c7b926d8dc18 100644
--- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/primitive3d/transformprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -27,10 +28,10 @@ using namespace com::sun::star;
namespace drawinglayer::primitive3d
{
TransformPrimitive3D::TransformPrimitive3D(
- const basegfx::B3DHomMatrix& rTransformation,
+ basegfx::B3DHomMatrix aTransformation,
const Primitive3DContainer& rChildren)
: GroupPrimitive3D(rChildren),
- maTransformation(rTransformation)
+ maTransformation(std::move(aTransformation))
{
}
diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx
index 211569f5fb04..f4aec90383ee 100644
--- a/drawinglayer/source/processor2d/baseprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx
@@ -19,6 +19,7 @@
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -30,8 +31,8 @@ namespace drawinglayer::processor2d
{
}
- BaseProcessor2D::BaseProcessor2D(const geometry::ViewInformation2D& rViewInformation)
- : maViewInformation2D(rViewInformation)
+ BaseProcessor2D::BaseProcessor2D(geometry::ViewInformation2D aViewInformation)
+ : maViewInformation2D(std::move(aViewInformation))
{
}
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index da34cd558a81..019feba35182 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -25,6 +25,7 @@
#include <comphelper/string.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <tools/debug.hxx>
+#include <utility>
#include <vcl/graph.hxx>
#include <vcl/outdev.hxx>
#include <rtl/ustrbuf.hxx>
@@ -1476,11 +1477,10 @@ void VclProcessor2D::adaptTextToFillDrawMode() const
// process support
VclProcessor2D::VclProcessor2D(const geometry::ViewInformation2D& rViewInformation,
- OutputDevice& rOutDev,
- const basegfx::BColorModifierStack& rInitStack)
+ OutputDevice& rOutDev, basegfx::BColorModifierStack aInitStack)
: BaseProcessor2D(rViewInformation)
, mpOutputDevice(&rOutDev)
- , maBColorModifierStack(rInitStack)
+ , maBColorModifierStack(std::move(aInitStack))
, mnPolygonStrokePrimitive2D(0)
, mpObjectInfoPrimitive2D(nullptr)
{
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx b/drawinglayer/source/processor2d/vclprocessor2d.hxx
index 7e251aa0ca13..798c6659bd73 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx
@@ -117,7 +117,7 @@ protected:
public:
// constructor/destructor
VclProcessor2D(const geometry::ViewInformation2D& rViewInformation, OutputDevice& rOutDev,
- const basegfx::BColorModifierStack& rInitStack = basegfx::BColorModifierStack());
+ basegfx::BColorModifierStack aInitStack = basegfx::BColorModifierStack());
virtual ~VclProcessor2D() override;
// access to currently used ObjectInfoPrimitive2D
diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx
index 02d437a1abba..a9638dc92bb4 100644
--- a/drawinglayer/source/processor3d/baseprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx
@@ -18,6 +18,7 @@
*/
#include <drawinglayer/processor3d/baseprocessor3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -29,8 +30,8 @@ namespace drawinglayer::processor3d
{
}
- BaseProcessor3D::BaseProcessor3D(const geometry::ViewInformation3D& rViewInformation)
- : maViewInformation3D(rViewInformation)
+ BaseProcessor3D::BaseProcessor3D(geometry::ViewInformation3D aViewInformation)
+ : maViewInformation3D(std::move(aViewInformation))
{
}
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index 568496bb989d..66c2b3be8aa0 100644
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
@@ -28,6 +28,7 @@
#include <drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx>
#include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
#include <primitive3d/textureprimitive3d.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -141,9 +142,9 @@ namespace drawinglayer::processor3d
Geometry2DExtractingProcessor::Geometry2DExtractingProcessor(
const geometry::ViewInformation3D& rViewInformation,
- const basegfx::B2DHomMatrix& rObjectTransformation)
+ basegfx::B2DHomMatrix aObjectTransformation)
: BaseProcessor3D(rViewInformation),
- maObjectTransformation(rObjectTransformation),
+ maObjectTransformation(std::move(aObjectTransformation)),
maBColorModifierStack()
{
}
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 91fc57aaec89..7157e7f2955b 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -30,6 +30,7 @@
#include <drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
#include <rtl/ref.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -202,13 +203,13 @@ namespace drawinglayer::processor3d
Shadow3DExtractingProcessor::Shadow3DExtractingProcessor(
const geometry::ViewInformation3D& rViewInformation,
- const basegfx::B2DHomMatrix& rObjectTransformation,
+ basegfx::B2DHomMatrix aObjectTransformation,
const basegfx::B3DVector& rLightNormal,
double fShadowSlant,
const basegfx::B3DRange& rContained3DRange)
: BaseProcessor3D(rViewInformation),
mpPrimitive2DSequence(&maPrimitive2DSequence),
- maObjectTransformation(rObjectTransformation),
+ maObjectTransformation(std::move(aObjectTransformation)),
maLightNormal(rLightNormal),
mfLightPlaneScalar(0.0),
mbShadowProjectionIsValid(false),
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index aa319161bd3d..b9cb8ffb7a1d 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -29,6 +29,7 @@
#include <drawinglayer/attribute/sdrlightingattribute3d.hxx>
#include <o3tl/safeint.hxx>
#include <svtools/optionsdrawinglayer.hxx>
+#include <utility>
using namespace com::sun::star;
@@ -375,16 +376,16 @@ private:
public:
RasterPrimitive3D(
- const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& pGeoTexSvx,
- const std::shared_ptr< drawinglayer::texture::GeoTexSvx >& pTransparenceGeoTexSvx,
+ std::shared_ptr< drawinglayer::texture::GeoTexSvx > pGeoTexSvx,
+ std::shared_ptr< drawinglayer::texture::GeoTexSvx > pTransparenceGeoTexSvx,
const drawinglayer::attribute::MaterialAttribute3D& rMaterial,
const basegfx::B3DPolyPolygon& rPolyPolygon,
bool bModulate,
bool bFilter,
bool bSimpleTextureActive,
bool bIsLine)
- : mpGeoTexSvx(pGeoTexSvx),
- mpTransparenceGeoTexSvx(pTransparenceGeoTexSvx),
+ : mpGeoTexSvx(std::move(pGeoTexSvx)),
+ mpTransparenceGeoTexSvx(std::move(pTransparenceGeoTexSvx)),
maMaterial(rMaterial),
maPolyPolygon(rPolyPolygon),
mfCenterZ(basegfx::utils::getRange(rPolyPolygon).getCenter().getZ()),