diff options
Diffstat (limited to 'svx/source/sdr/primitive2d')
10 files changed, 54 insertions, 44 deletions
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 50787ed399f1..51164210a5cc 100644 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx @@ -23,6 +23,7 @@ #include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <utility> using namespace com::sun::star; @@ -119,14 +120,14 @@ namespace drawinglayer::primitive2d } SdrCaptionPrimitive2D::SdrCaptionPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, - const basegfx::B2DPolygon& rTail, + basegfx::B2DPolygon aTail, double fCornerRadiusX, double fCornerRadiusY) - : maTransform(rTransform), + : maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute), - maTail(rTail), + maTail(std::move(aTail)), mfCornerRadiusX(fCornerRadiusX), mfCornerRadiusY(fCornerRadiusY) { diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index aa663fb7aa7f..ccfc5c111d97 100644 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx @@ -23,6 +23,7 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <utility> using namespace com::sun::star; @@ -77,9 +78,9 @@ namespace drawinglayer::primitive2d SdrConnectorPrimitive2D::SdrConnectorPrimitive2D( const attribute::SdrLineEffectsTextAttribute& rSdrLSTAttribute, - const ::basegfx::B2DPolygon& rUnitPolygon) + ::basegfx::B2DPolygon aUnitPolygon) : maSdrLSTAttribute(rSdrLSTAttribute), - maUnitPolygon(rUnitPolygon) + maUnitPolygon(std::move(aUnitPolygon)) { } diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index dddb8aa3069a..19717e2eb121 100644 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx @@ -24,6 +24,7 @@ #include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> +#include <utility> using namespace com::sun::star; @@ -90,16 +91,16 @@ namespace drawinglayer::primitive2d SdrCustomShapePrimitive2D::SdrCustomShapePrimitive2D( const attribute::SdrEffectsTextAttribute& rSdrSTAttribute, Primitive2DContainer&& rSubPrimitives, - const basegfx::B2DHomMatrix& rTextBox, + basegfx::B2DHomMatrix aTextBox, bool bWordWrap, bool b3DShape, - const basegfx::B2DHomMatrix& rTransform) + basegfx::B2DHomMatrix aTransform) : maSdrSTAttribute(rSdrSTAttribute), maSubPrimitives(std::move(rSubPrimitives)), - maTextBox(rTextBox), + maTextBox(std::move(aTextBox)), mbWordWrap(bWordWrap), mb3DShape(b3DShape), - maTransform(rTransform) + maTransform(std::move(aTransform)) { } diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index 89c348beb01b..126b301391d8 100644 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx @@ -25,6 +25,7 @@ #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <utility> using namespace com::sun::star; @@ -109,9 +110,9 @@ namespace drawinglayer::primitive2d } SdrEllipsePrimitive2D::SdrEllipsePrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute) - : maTransform(rTransform), + : maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute) { } diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index f5ac21cfc9c8..18bef098575a 100644 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx @@ -23,6 +23,7 @@ #include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> +#include <utility> namespace drawinglayer::primitive2d { @@ -124,10 +125,10 @@ void SdrGrafPrimitive2D::create2DDecomposition( } SdrGrafPrimitive2D::SdrGrafPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, const GraphicObject& rGraphicObject, const GraphicAttr& rGraphicAttr) - : maTransform(rTransform) + : maTransform(std::move(aTransform)) , maSdrLFSTAttribute(rSdrLFSTAttribute) , maGraphicObject(rGraphicObject) , maGraphicAttr(rGraphicAttr) diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index e7576b4983e8..3a4ed80c8166 100644 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx @@ -24,6 +24,7 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <utility> using namespace com::sun::star; @@ -33,10 +34,10 @@ namespace drawinglayer::primitive2d { SdrOle2Primitive2D::SdrOle2Primitive2D( Primitive2DContainer&& rOLEContent, - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute) : maOLEContent(std::move(rOLEContent)), - maTransform(rTransform), + maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute) { } diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index f520a3d972b9..fe7e53481039 100644 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -20,6 +20,7 @@ #include <sdr/primitive2d/sdrolecontentprimitive2d.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <svx/svdoole2.hxx> +#include <utility> #include <vcl/svapp.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/primitive2d/PolygonHairlinePrimitive2D.hxx> @@ -130,11 +131,11 @@ namespace drawinglayer::primitive2d SdrOleContentPrimitive2D::SdrOleContentPrimitive2D( const SdrOle2Obj& rSdrOle2Obj, - const basegfx::B2DHomMatrix& rObjectTransform, + basegfx::B2DHomMatrix aObjectTransform, sal_uInt32 nGraphicVersion ) : mpSdrOle2Obj(const_cast< SdrOle2Obj* >(&rSdrOle2Obj)), - maObjectTransform(rObjectTransform), + maObjectTransform(std::move(aObjectTransform)), mnGraphicVersion(nGraphicVersion) { } diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index 829525e2bc36..46fcec09115b 100644 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx @@ -21,6 +21,7 @@ #include <sdr/primitive2d/sdrdecompositiontools.hxx> #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <utility> using namespace com::sun::star; @@ -119,14 +120,14 @@ namespace drawinglayer::primitive2d } SdrPathPrimitive2D::SdrPathPrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, - const basegfx::B2DPolyPolygon& rUnitPolyPolygon, - const basegfx::B2DPolyPolygon& rUnitDefinitionPolyPolygon) - : maTransform(rTransform), + basegfx::B2DPolyPolygon aUnitPolyPolygon, + basegfx::B2DPolyPolygon aUnitDefinitionPolyPolygon) + : maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute), - maUnitPolyPolygon(rUnitPolyPolygon), - maUnitDefinitionPolyPolygon(rUnitDefinitionPolyPolygon) + maUnitPolyPolygon(std::move(aUnitPolyPolygon)), + maUnitDefinitionPolyPolygon(std::move(aUnitDefinitionPolyPolygon)) { } diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index f289ea6bcac2..2f1fe3d7e494 100644 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx @@ -24,6 +24,7 @@ #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <utility> using namespace com::sun::star; @@ -112,12 +113,12 @@ namespace drawinglayer::primitive2d } SdrRectanglePrimitive2D::SdrRectanglePrimitive2D( - const basegfx::B2DHomMatrix& rTransform, + basegfx::B2DHomMatrix aTransform, const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, double fCornerRadiusX, double fCornerRadiusY, bool bForceFillForHitTest) - : maTransform(rTransform), + : maTransform(std::move(aTransform)), maSdrLFSTAttribute(rSdrLFSTAttribute), mfCornerRadiusX(fCornerRadiusX), mfCornerRadiusY(fCornerRadiusY), diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 6311c123ded5..386800af663d 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -30,6 +30,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <utility> #include <osl/diagnose.h> @@ -95,9 +96,9 @@ namespace drawinglayer::primitive2d SdrTextPrimitive2D::SdrTextPrimitive2D( const SdrText* pSdrText, - const OutlinerParaObject& rOutlinerParaObject) + OutlinerParaObject aOutlinerParaObject) : mrSdrText(const_cast< SdrText* >(pSdrText)), - maOutlinerParaObject(rOutlinerParaObject), + maOutlinerParaObject(std::move(aOutlinerParaObject)), mnLastPageNumber(0), mnLastPageCount(0), mbContainsPageField(false), @@ -248,11 +249,11 @@ namespace drawinglayer::primitive2d SdrContourTextPrimitive2D::SdrContourTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DPolyPolygon& rUnitPolyPolygon, - const basegfx::B2DHomMatrix& rObjectTransform) + basegfx::B2DPolyPolygon aUnitPolyPolygon, + basegfx::B2DHomMatrix aObjectTransform) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maUnitPolyPolygon(rUnitPolyPolygon), - maObjectTransform(rObjectTransform) + maUnitPolyPolygon(std::move(aUnitPolyPolygon)), + maObjectTransform(std::move(aObjectTransform)) { } @@ -297,11 +298,11 @@ namespace drawinglayer::primitive2d SdrPathTextPrimitive2D::SdrPathTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DPolyPolygon& rPathPolyPolygon, - const attribute::SdrFormTextAttribute& rSdrFormTextAttribute) + basegfx::B2DPolyPolygon aPathPolyPolygon, + attribute::SdrFormTextAttribute aSdrFormTextAttribute) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maPathPolyPolygon(rPathPolyPolygon), - maSdrFormTextAttribute(rSdrFormTextAttribute) + maPathPolyPolygon(std::move(aPathPolyPolygon)), + maSdrFormTextAttribute(std::move(aSdrFormTextAttribute)) { } @@ -349,7 +350,7 @@ namespace drawinglayer::primitive2d SdrBlockTextPrimitive2D::SdrBlockTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DHomMatrix& rTextRangeTransform, + basegfx::B2DHomMatrix aTextRangeTransform, SdrTextHorzAdjust aSdrTextHorzAdjust, SdrTextVertAdjust aSdrTextVertAdjust, bool bFixedCellHeight, @@ -357,7 +358,7 @@ namespace drawinglayer::primitive2d bool bCellText, bool bWordWrap) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maTextRangeTransform(rTextRangeTransform), + maTextRangeTransform(std::move(aTextRangeTransform)), maSdrTextHorzAdjust(aSdrTextHorzAdjust), maSdrTextVertAdjust(aSdrTextVertAdjust), mbFixedCellHeight(bFixedCellHeight), @@ -418,10 +419,10 @@ namespace drawinglayer::primitive2d SdrAutoFitTextPrimitive2D::SdrAutoFitTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rParaObj, - const ::basegfx::B2DHomMatrix& rTextRangeTransform, + ::basegfx::B2DHomMatrix aTextRangeTransform, bool bWordWrap) : SdrTextPrimitive2D(pSdrText, rParaObj), - maTextRangeTransform(rTextRangeTransform), + maTextRangeTransform(std::move(aTextRangeTransform)), mbWordWrap(bWordWrap) { } @@ -456,9 +457,9 @@ namespace drawinglayer::primitive2d SdrChainedTextPrimitive2D::SdrChainedTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DHomMatrix& rTextRangeTransform) + basegfx::B2DHomMatrix aTextRangeTransform) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maTextRangeTransform(rTextRangeTransform) + maTextRangeTransform(std::move(aTextRangeTransform)) { } void SdrChainedTextPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const @@ -504,10 +505,10 @@ namespace drawinglayer::primitive2d SdrStretchTextPrimitive2D::SdrStretchTextPrimitive2D( const SdrText* pSdrText, const OutlinerParaObject& rOutlinerParaObject, - const basegfx::B2DHomMatrix& rTextRangeTransform, + basegfx::B2DHomMatrix aTextRangeTransform, bool bFixedCellHeight) : SdrTextPrimitive2D(pSdrText, rOutlinerParaObject), - maTextRangeTransform(rTextRangeTransform), + maTextRangeTransform(std::move(aTextRangeTransform)), mbFixedCellHeight(bFixedCellHeight) { } |