diff options
122 files changed, 413 insertions, 350 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()), diff --git a/include/drawinglayer/attribute/sdrallattribute3d.hxx b/include/drawinglayer/attribute/sdrallattribute3d.hxx index d0b1101aa589..53d7a1f75aa7 100644 --- a/include/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrallattribute3d.hxx @@ -46,11 +46,11 @@ namespace drawinglayer::attribute public: /// constructors/assignmentoperator/destructor SdrLineFillShadowAttribute3D( - const SdrLineAttribute& rLine, - const SdrFillAttribute& rFill, - const SdrLineStartEndAttribute& rLineStartEnd, - const SdrShadowAttribute& rShadow, - const FillGradientAttribute& rFillFloatTransGradient); + SdrLineAttribute aLine, + SdrFillAttribute aFill, + SdrLineStartEndAttribute aLineStartEnd, + SdrShadowAttribute aShadow, + FillGradientAttribute aFillFloatTransGradient); SdrLineFillShadowAttribute3D(); // compare operator diff --git a/include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx index 25b0aad475aa..999322a2654d 100644 --- a/include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx @@ -44,7 +44,7 @@ private: public: /// constructor - PolyPolygonColorPrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::BColor& rBColor); /// data read access diff --git a/include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx index 9cdeee03f0b4..6009c5b238d6 100644 --- a/include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx @@ -54,10 +54,10 @@ private: public: /// constructors. The one without definition range will use output range as definition range PolyPolygonGradientPrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, - const attribute::FillGradientAttribute& rFillGradient); - PolyPolygonGradientPrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + attribute::FillGradientAttribute rFillGradient); + PolyPolygonGradientPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::B2DRange& rDefinitionRange, - const attribute::FillGradientAttribute& rFillGradient); + attribute::FillGradientAttribute aFillGradient); /// data read access const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; } diff --git a/include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx index 82094a07ccc7..e6c9c0f7538c 100644 --- a/include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx @@ -52,7 +52,7 @@ private: const geometry::ViewInformation2D& rViewInformation) const override; public: - PolyPolygonGraphicPrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + PolyPolygonGraphicPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::B2DRange& rDefinitionRange, const attribute::FillGraphicAttribute& rFillGraphic); diff --git a/include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx index 1cab074fabf9..7cb2fbb73dac 100644 --- a/include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx @@ -50,7 +50,7 @@ private: public: /// constructor - PolyPolygonHairlinePrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + PolyPolygonHairlinePrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::BColor& rBColor); /// data read access diff --git a/include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx index 960d2e600d0e..8fb9514c726e 100644 --- a/include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx @@ -59,11 +59,11 @@ public: /// constructors. The one without definition range will use output range as definition range PolyPolygonHatchPrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, const basegfx::BColor& rBackgroundColor, - const attribute::FillHatchAttribute& rFillHatch); - PolyPolygonHatchPrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + attribute::FillHatchAttribute aFillHatch); + PolyPolygonHatchPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::B2DRange& rDefinitionRange, const basegfx::BColor& rBackgroundColor, - const attribute::FillHatchAttribute& rFillHatch); + attribute::FillHatchAttribute aFillHatch); /// data read access const basegfx::B2DPolyPolygon& getB2DPolyPolygon() const { return maPolyPolygon; } diff --git a/include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx index b2dc64630ecb..dcf29ba9e493 100644 --- a/include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx @@ -56,7 +56,7 @@ private: public: /// constructor - PolyPolygonMarkerPrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + PolyPolygonMarkerPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::BColor& rRGBColorA, const basegfx::BColor& rRGBColorB, double fDiscreteDashLength); diff --git a/include/drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx index 59f1327f0bd5..15366abf87b1 100644 --- a/include/drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx @@ -60,7 +60,7 @@ private: public: /// constructor - PolyPolygonSelectionPrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + PolyPolygonSelectionPrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const basegfx::BColor& rColor, double fTransparence, double fDiscreteGrow, bool bFill); diff --git a/include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx index 94a58b466ffe..f7cadeb944d5 100644 --- a/include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx @@ -54,11 +54,11 @@ private: public: /// constructor - PolyPolygonStrokePrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + PolyPolygonStrokePrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::StrokeAttribute& rStrokeAttribute); + attribute::StrokeAttribute aStrokeAttribute); - PolyPolygonStrokePrimitive2D(const basegfx::B2DPolyPolygon& rPolyPolygon, + PolyPolygonStrokePrimitive2D(basegfx::B2DPolyPolygon aPolyPolygon, const attribute::LineAttribute& rLineAttribute); /// data read access diff --git a/include/drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx b/include/drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx index d057827865f9..6c222c76d7bc 100644 --- a/include/drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx @@ -46,7 +46,7 @@ private: public: /// constructor - PolygonHairlinePrimitive2D(const basegfx::B2DPolygon& rPolygon, const basegfx::BColor& rBColor); + PolygonHairlinePrimitive2D(basegfx::B2DPolygon aPolygon, const basegfx::BColor& rBColor); /// data read access const basegfx::B2DPolygon& getB2DPolygon() const { return maPolygon; } diff --git a/include/drawinglayer/primitive2d/PolygonMarkerPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolygonMarkerPrimitive2D.hxx index 9bdcb53528cf..d2087b608c1d 100644 --- a/include/drawinglayer/primitive2d/PolygonMarkerPrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolygonMarkerPrimitive2D.hxx @@ -61,7 +61,7 @@ private: public: /// constructor - PolygonMarkerPrimitive2D(const basegfx::B2DPolygon& rPolygon, const basegfx::BColor& rRGBColorA, + PolygonMarkerPrimitive2D(basegfx::B2DPolygon aPolygon, const basegfx::BColor& rRGBColorA, const basegfx::BColor& rRGBColorB, double fDiscreteDashLength); /// data read access diff --git a/include/drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx b/include/drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx index ab1566033f2f..0135a894ce1e 100644 --- a/include/drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx +++ b/include/drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx @@ -54,12 +54,12 @@ protected: public: /// constructor - PolygonStrokePrimitive2D(const basegfx::B2DPolygon& rPolygon, + PolygonStrokePrimitive2D(basegfx::B2DPolygon aPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::StrokeAttribute& rStrokeAttribute); + attribute::StrokeAttribute aStrokeAttribute); /// constructor without stroking - PolygonStrokePrimitive2D(const basegfx::B2DPolygon& rPolygon, + PolygonStrokePrimitive2D(basegfx::B2DPolygon aPolygon, const attribute::LineAttribute& rLineAttribute); /// data read access diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx index 9e011bbeaeca..4d6d6250a52c 100644 --- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -32,6 +32,7 @@ #include <salhelper/simplereferenceobject.hxx> #include <rtl/ref.hxx> #include <deque> +#include <utility> namespace drawinglayer::geometry { @@ -177,8 +178,8 @@ class DRAWINGLAYERCORE_DLLPUBLIC UnoPrimitive2D final : public BasePrimitive2DIm public: // constructor/destructor - UnoPrimitive2D(const rtl::Reference<BasePrimitive2D>& rPrimitive) - : mxPrimitive(rPrimitive) + UnoPrimitive2D(rtl::Reference<BasePrimitive2D> xPrimitive) + : mxPrimitive(std::move(xPrimitive)) { } virtual ~UnoPrimitive2D() override; diff --git a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx index 46c0825af5e5..40d4d5e541bc 100644 --- a/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -52,8 +52,8 @@ private: public: /// constructor - BitmapPrimitive2D(const css::uno::Reference<css::awt::XBitmap>& rXBitmap, - const basegfx::B2DHomMatrix& rTransform); + BitmapPrimitive2D(css::uno::Reference<css::awt::XBitmap> xXBitmap, + basegfx::B2DHomMatrix aTransform); /// data read access const css::uno::Reference<css::awt::XBitmap>& getXBitmap() const { return maXBitmap; } diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index fe4580d079a4..5d58feded567 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -114,7 +114,7 @@ public: /// simplified constructor for BorderLine with single edge BorderLinePrimitive2D(const basegfx::B2DPoint& rStart, const basegfx::B2DPoint& rEnd, std::vector<BorderLine>&& rBorderLines, - const drawinglayer::attribute::StrokeAttribute& rStrokeAttribute); + drawinglayer::attribute::StrokeAttribute aStrokeAttribute); /// data read access const basegfx::B2DPoint& getStart() const { return maStart; } diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index 015151cf8dfc..e3d5a5c0948d 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -72,16 +72,16 @@ private: public: /// constructor - ControlPrimitive2D(const basegfx::B2DHomMatrix& rTransform, - const css::uno::Reference<css::awt::XControlModel>& rxControlModel); + ControlPrimitive2D(basegfx::B2DHomMatrix aTransform, + css::uno::Reference<css::awt::XControlModel> xControlModel); /** constructor with an additional XControl as parameter to allow to hand it over at incarnation time if it exists. This will avoid to create a 2nd one on demand in createXControl() and thus double the XControls. */ - ControlPrimitive2D(const basegfx::B2DHomMatrix& rTransform, - const css::uno::Reference<css::awt::XControlModel>& rxControlModel, - const css::uno::Reference<css::awt::XControl>& rxXControl); + ControlPrimitive2D(basegfx::B2DHomMatrix aTransform, + css::uno::Reference<css::awt::XControlModel> xControlModel, + css::uno::Reference<css::awt::XControl> xXControl); /// data read access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } diff --git a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index 435ab98253bd..81e6bb689389 100644 --- a/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -91,8 +91,8 @@ namespace drawinglayer::primitive2d public: /// constructor DiscreteShadowPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, - const DiscreteShadow& rDiscreteShadow); + basegfx::B2DHomMatrix aTransform, + DiscreteShadow aDiscreteShadow); /// data read access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } diff --git a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index 959b38592682..3fc9ab5be691 100644 --- a/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -83,9 +83,9 @@ namespace drawinglayer::primitive2d public: /// constructor Embedded3DPrimitive2D( - const primitive3d::Primitive3DContainer& rxChildren3D, - const basegfx::B2DHomMatrix& rObjectTransformation, - const geometry::ViewInformation3D& rViewInformation3D, + primitive3d::Primitive3DContainer xChildren3D, + basegfx::B2DHomMatrix aObjectTransformation, + geometry::ViewInformation3D aViewInformation3D, const basegfx::B3DVector& rLightNormal, double fShadowSlant, const basegfx::B3DRange& rScene3DRange); diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx index 7aa72b6cef34..39782bf3ccc6 100644 --- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -45,8 +45,8 @@ namespace drawinglayer::primitive2d public: /// constructor EpsPrimitive2D( - const basegfx::B2DHomMatrix& rEpsTransform, - const GfxLink& rGfxLink, + basegfx::B2DHomMatrix aEpsTransform, + GfxLink aGfxLink, const GDIMetaFile& rMetaFile); /// data read access diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 9fe2fbcbc4ec..43a3179cbe4e 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -88,11 +88,11 @@ namespace drawinglayer::primitive2d /// constructors. The one without definition range will use output range as definition range FillGradientPrimitive2D( const basegfx::B2DRange& rOutputRange, - const attribute::FillGradientAttribute& rFillGradient); + attribute::FillGradientAttribute aFillGradient); FillGradientPrimitive2D( const basegfx::B2DRange& rOutputRange, const basegfx::B2DRange& rDefinitionRange, - const attribute::FillGradientAttribute& rFillGradient); + attribute::FillGradientAttribute aFillGradient); /// data read access const basegfx::B2DRange& getOutputRange() const { return maOutputRange; } diff --git a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx index 51d49df30d5e..bf8222f23785 100644 --- a/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx @@ -58,7 +58,7 @@ namespace drawinglayer::primitive2d public: /// constructor FillGraphicPrimitive2D( - const basegfx::B2DHomMatrix& rTransformation, + basegfx::B2DHomMatrix aTransformation, const attribute::FillGraphicAttribute& rFillGraphic); /// data read access diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 03bc12139fcb..09a74618d7dd 100644 --- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -67,12 +67,12 @@ namespace drawinglayer::primitive2d FillHatchPrimitive2D( const basegfx::B2DRange& rOutputRange, const basegfx::BColor& rBColor, - const attribute::FillHatchAttribute& rFillHatch); + attribute::FillHatchAttribute aFillHatch); FillHatchPrimitive2D( const basegfx::B2DRange& rOutputRange, const basegfx::B2DRange& rDefinitionRange, const basegfx::BColor& rBColor, - const attribute::FillHatchAttribute& rFillHatch); + attribute::FillHatchAttribute aFillHatch); /// data read access const basegfx::B2DRange& getOutputRange() const { return maOutputRange; } diff --git a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx index 9bce4b8c051c..1857eef4c9e7 100644 --- a/include/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -61,10 +61,9 @@ private: public: /// constructor(s) - GraphicPrimitive2D(const basegfx::B2DHomMatrix& rTransform, const GraphicObject& rGraphicObject, + GraphicPrimitive2D(basegfx::B2DHomMatrix aTransform, const GraphicObject& rGraphicObject, const GraphicAttr& rGraphicAttr); - GraphicPrimitive2D(const basegfx::B2DHomMatrix& rTransform, - const GraphicObject& rGraphicObject); + GraphicPrimitive2D(basegfx::B2DHomMatrix aTransform, const GraphicObject& rGraphicObject); /// data read access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx index 3c2bf595add4..a6d4d03c588e 100644 --- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -72,7 +72,7 @@ namespace drawinglayer::primitive2d public: /// constructor GridPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, double fWidth, double fHeight, double fSmallestViewDistance, diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx index e2d8c0e65249..cf62ced669a9 100644 --- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -50,7 +50,7 @@ namespace drawinglayer::primitive2d public: /// constructor MaskPrimitive2D( - const basegfx::B2DPolyPolygon& rMask, + basegfx::B2DPolyPolygon aMask, Primitive2DContainer&& aChildren); /// data read access diff --git a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx index 084b6728a183..e0a3e04e8d91 100644 --- a/include/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -61,11 +61,11 @@ namespace drawinglayer::primitive2d public: /// constructor MediaPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, - const OUString& rURL, + basegfx::B2DHomMatrix aTransform, + OUString aURL, const basegfx::BColor& rBackgroundColor, sal_uInt32 nDiscreteBorder, - const Graphic &rSnapshot); + Graphic aSnapshot); /// data read access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } diff --git a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx index c6caded90347..2f82270aebba 100644 --- a/include/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -65,7 +65,7 @@ namespace drawinglayer::primitive2d public: /// constructor MetafilePrimitive2D( - const basegfx::B2DHomMatrix& rMetaFileTransform, + basegfx::B2DHomMatrix aMetaFileTransform, const GDIMetaFile& rMetaFile); /// data read access diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index 167ed054fa6e..b48d178ec07c 100644 --- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer::primitive2d /// constructor ModifiedColorPrimitive2D( Primitive2DContainer&& aChildren, - const basegfx::BColorModifierSharedPtr& rColorModifier); + basegfx::BColorModifierSharedPtr xColorModifier); /// data read access const basegfx::BColorModifierSharedPtr& getColorModifier() const { return maColorModifier; } diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx index 9df931a96997..6dc410b86cbb 100644 --- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx @@ -44,9 +44,9 @@ namespace drawinglayer::primitive2d /// constructor ObjectInfoPrimitive2D( Primitive2DContainer&& aChildren, - const OUString& rName, - const OUString& rTitle, - const OUString& rDesc); + OUString aName, + OUString aTitle, + OUString aDesc); /// data read access const OUString& getName() const { return maName; } diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 6ee1475575c0..f1ec668a9e81 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -62,8 +62,8 @@ namespace drawinglayer::primitive2d public: /// constructor 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); diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index 9da0e44e5414..c12a7622c3b2 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -63,7 +63,7 @@ namespace drawinglayer::primitive2d public: /// constructor PatternFillPrimitive2D( - const basegfx::B2DPolyPolygon& rMask, + basegfx::B2DPolyPolygon aMask, Primitive2DContainer&& rChildren, const basegfx::B2DRange& rReferenceRange); diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index 3fc027fcbaed..5965962a7013 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -116,11 +116,11 @@ namespace drawinglayer::primitive2d /// constructor ScenePrimitive2D( - const primitive3d::Primitive3DContainer& rxChildren3D, - const attribute::SdrSceneAttribute& rSdrSceneAttribute, - const attribute::SdrLightingAttribute& rSdrLightingAttribute, - const basegfx::B2DHomMatrix& rObjectTransformation, - const geometry::ViewInformation3D& rViewInformation3D); + primitive3d::Primitive3DContainer xChildren3D, + attribute::SdrSceneAttribute aSdrSceneAttribute, + attribute::SdrLightingAttribute aSdrLightingAttribute, + basegfx::B2DHomMatrix aObjectTransformation, + geometry::ViewInformation3D aViewInformation3D); /// data read access const primitive3d::Primitive3DContainer& getChildren3D() const { return mxChildren3D; } diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx index 7df83a395f19..45a97a96d476 100644 --- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -58,7 +58,7 @@ namespace drawinglayer::primitive2d public: /// constructor ShadowPrimitive2D( - const basegfx::B2DHomMatrix& rShadowTransform, + basegfx::B2DHomMatrix aShadowTransform, const basegfx::BColor& rShadowColor, double fShadowBlur, Primitive2DContainer&& aChildren); diff --git a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx index 66c68fdaf3bf..a78f29fda86e 100644 --- a/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/svggradientprimitive2d.hxx @@ -147,8 +147,8 @@ namespace drawinglayer::primitive2d public: /// constructor SvgGradientHelper( - const basegfx::B2DHomMatrix& rGradientTransform, - const basegfx::B2DPolyPolygon& rPolyPolygon, + basegfx::B2DHomMatrix aGradientTransform, + basegfx::B2DPolyPolygon aPolyPolygon, SvgGradientEntryVector&& rGradientEntries, const basegfx::B2DPoint& rStart, bool bUseUnitCoordinates, diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index 1c23edafd0ad..fd80e531e910 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -136,11 +136,10 @@ protected: public: /// constructor - TextSimplePortionPrimitive2D(const basegfx::B2DHomMatrix& rNewTransform, const OUString& rText, + TextSimplePortionPrimitive2D(basegfx::B2DHomMatrix aNewTransform, OUString aText, sal_Int32 nTextPosition, sal_Int32 nTextLength, std::vector<double>&& rDXArray, - const attribute::FontAttribute& rFontAttribute, - const css::lang::Locale& rLocale, + attribute::FontAttribute aFontAttribute, css::lang::Locale aLocale, const basegfx::BColor& rFontColor, bool bFilled = false, tools::Long nWidthToFill = 0, const Color& rTextFillColor = COL_TRANSPARENT); diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx index c1b620fc7628..73e589b8c2e8 100644 --- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -55,7 +55,7 @@ namespace drawinglayer::primitive2d public: /// constructor TransformPrimitive2D( - const basegfx::B2DHomMatrix& rTransformation, + basegfx::B2DHomMatrix aTransformation, Primitive2DContainer&& rChildren); /// data read access diff --git a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index 559e9e191a60..8fe794a40ce1 100644 --- a/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -61,7 +61,7 @@ namespace drawinglayer::primitive2d public: /// constructor WrongSpellPrimitive2D( - const basegfx::B2DHomMatrix& rTransformation, + basegfx::B2DHomMatrix aTransformation, double fStart, double fStop, const basegfx::BColor& rColor); diff --git a/include/drawinglayer/primitive3d/groupprimitive3d.hxx b/include/drawinglayer/primitive3d/groupprimitive3d.hxx index d77bb0db9179..f1099122dcfe 100644 --- a/include/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer::primitive3d public: /// constructor - explicit GroupPrimitive3D(const Primitive3DContainer& rChildren); + explicit GroupPrimitive3D(Primitive3DContainer aChildren); /// data read access const Primitive3DContainer& getChildren() const { return maChildren; } diff --git a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index d33fba13d7b2..92ca546b79b2 100644 --- a/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -45,7 +45,7 @@ namespace drawinglayer::primitive3d /// constructor ModifiedColorPrimitive3D( const Primitive3DContainer& rChildren, - const basegfx::BColorModifierSharedPtr& rColorModifier); + basegfx::BColorModifierSharedPtr xColorModifier); /// data read access const basegfx::BColorModifierSharedPtr& getColorModifier() const { return maColorModifier; } diff --git a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx index 76f4a8fe7b39..a414cd27d472 100644 --- a/include/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -51,7 +51,7 @@ namespace drawinglayer::primitive3d public: /// constructor PolygonHairlinePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + basegfx::B3DPolygon aPolygon, const basegfx::BColor& rBColor); /// data read access @@ -97,9 +97,9 @@ namespace drawinglayer::primitive3d public: /// constructor PolygonStrokePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + basegfx::B3DPolygon aPolygon, const attribute::LineAttribute& rLineAttribute, - const attribute::StrokeAttribute& rStrokeAttribute); + attribute::StrokeAttribute aStrokeAttribute); /// data read access const basegfx::B3DPolygon& getB3DPolygon() const { return maPolygon; } diff --git a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index bc229840efd6..a378a04d908b 100644 --- a/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -51,7 +51,7 @@ namespace drawinglayer::primitive3d public: /// constructor PolyPolygonMaterialPrimitive3D( - const basegfx::B3DPolyPolygon& rPolyPolygon, + basegfx::B3DPolyPolygon aPolyPolygon, const attribute::MaterialAttribute3D& rMaterial, bool bDoubleSided); diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 860f4f72bba0..a90dd2394561 100644 --- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -79,7 +79,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, diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 779d92e17205..e1ec1b735043 100644 --- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -81,7 +81,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, diff --git a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 922414cf6f70..ae6210acd011 100644 --- a/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -49,7 +49,7 @@ namespace drawinglayer::primitive3d public: /// constructor SdrPolyPolygonPrimitive3D( - const basegfx::B3DPolyPolygon& rPolyPolygon3D, + basegfx::B3DPolyPolygon aPolyPolygon3D, const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, diff --git a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx index bd8991f78128..8f05a87afb16 100644 --- a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -63,9 +63,9 @@ namespace drawinglayer public: /// constructor SdrPrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + basegfx::B3DHomMatrix aTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + attribute::SdrLineFillShadowAttribute3D aSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// data read access diff --git a/include/drawinglayer/primitive3d/transformprimitive3d.hxx b/include/drawinglayer/primitive3d/transformprimitive3d.hxx index a99ea27e801f..b30ba3811426 100644 --- a/include/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -46,7 +46,7 @@ namespace drawinglayer::primitive3d public: /// constructor TransformPrimitive3D( - const basegfx::B3DHomMatrix& rTransformation, + basegfx::B3DHomMatrix aTransformation, const Primitive3DContainer& rChildren); /// data read access diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx index 7ab7186308f1..9d1bb6b8a7a5 100644 --- a/include/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx @@ -182,7 +182,7 @@ namespace drawinglayer::processor2d public: /// constructor/destructor - explicit BaseProcessor2D(const geometry::ViewInformation2D& rViewInformation); + explicit BaseProcessor2D(geometry::ViewInformation2D aViewInformation); virtual ~BaseProcessor2D(); /// the central processing method diff --git a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 42e2376f0b58..feaea118e147 100644 --- a/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/include/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -26,6 +26,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/color/bcolormodifier.hxx> +#include <utility> #include <vector> @@ -41,10 +42,10 @@ namespace drawinglayer::processor2d public: TextAsPolygonDataNode( - const basegfx::B2DPolyPolygon& rB2DPolyPolygon, + basegfx::B2DPolyPolygon aB2DPolyPolygon, const basegfx::BColor& rBColor, bool bIsFilled) - : maB2DPolyPolygon(rB2DPolyPolygon), + : maB2DPolyPolygon(std::move(aB2DPolyPolygon)), maBColor(rBColor), mbIsFilled(bIsFilled) { diff --git a/include/drawinglayer/processor3d/baseprocessor3d.hxx b/include/drawinglayer/processor3d/baseprocessor3d.hxx index b70e38ee9a0a..406dede08fd1 100644 --- a/include/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/include/drawinglayer/processor3d/baseprocessor3d.hxx @@ -53,7 +53,7 @@ namespace drawinglayer::processor3d virtual void processBasePrimitive3D(const primitive3d::BasePrimitive3D& rCandidate); public: - explicit BaseProcessor3D(const geometry::ViewInformation3D& rViewInformation); + explicit BaseProcessor3D(geometry::ViewInformation3D aViewInformation); virtual ~BaseProcessor3D(); // the central processing method |