summaryrefslogtreecommitdiff
path: root/include/drawinglayer
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-09-09 13:00:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-09-09 15:22:52 +0200
commit8104d771b10a5c8b15eae4b67aa112ae2ef77b5b (patch)
tree095a091a90104689a1d6d53ed7060feb0973c1ea /include/drawinglayer
parentca512f301faf42b7d23675ca251b20e0ad67db1b (diff)
tdf#144052 reduce Primitive2D copying
when creating charts, by using a Primitive2DContainer&& parameter in the GroupPrimitive2D constructor, which forces the call sites to pass a temporary, and at most call sites, we can std::move in an existing local variable. Change-Id: I531970918800c6832ab606b5a4ff5fd2d47ccf5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121844 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/drawinglayer')
-rw-r--r--include/drawinglayer/primitive2d/animatedprimitive2d.hxx6
-rw-r--r--include/drawinglayer/primitive2d/glowprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/groupprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/invertprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/maskprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/shadowprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/softedgeprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/structuretagprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx12
-rw-r--r--include/drawinglayer/primitive2d/transformprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/transparenceprimitive2d.hxx4
-rw-r--r--include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx2
16 files changed, 24 insertions, 24 deletions
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
index 677235111e2d..61ff4d33ef60 100644
--- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
@@ -78,7 +78,7 @@ protected:
public:
/// constructor
AnimatedSwitchPrimitive2D(const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DContainer& rChildren, bool bIsTextAnimation);
+ Primitive2DContainer&& aChildren, bool bIsTextAnimation);
/// destructor - needed due to mpAnimationEntry
virtual ~AnimatedSwitchPrimitive2D() override;
@@ -114,7 +114,7 @@ class DRAWINGLAYER_DLLPUBLIC AnimatedBlinkPrimitive2D final : public AnimatedSwi
public:
/// constructor
AnimatedBlinkPrimitive2D(const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DContainer& rChildren);
+ Primitive2DContainer&& aChildren);
/// create local decomposition
virtual void
@@ -142,7 +142,7 @@ public:
/// constructor
AnimatedInterpolatePrimitive2D(const std::vector<basegfx::B2DHomMatrix>& rmMatrixStack,
const animation::AnimationEntry& rAnimationEntry,
- const Primitive2DContainer& rChildren);
+ Primitive2DContainer&& aChildren);
/// create local decomposition
virtual void
diff --git a/include/drawinglayer/primitive2d/glowprimitive2d.hxx b/include/drawinglayer/primitive2d/glowprimitive2d.hxx
index b91d40a21419..7dd65e7252dc 100644
--- a/include/drawinglayer/primitive2d/glowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/glowprimitive2d.hxx
@@ -37,7 +37,7 @@ private:
public:
/// constructor
- GlowPrimitive2D(const Color& rGlowColor, double fRadius, const Primitive2DContainer& rChildren);
+ GlowPrimitive2D(const Color& rGlowColor, double fRadius, Primitive2DContainer&& rChildren);
/// data read access
const Color& getGlowColor() const { return maGlowColor; }
diff --git a/include/drawinglayer/primitive2d/groupprimitive2d.hxx b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
index 06719311505f..d2110ed0b3aa 100644
--- a/include/drawinglayer/primitive2d/groupprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/groupprimitive2d.hxx
@@ -68,7 +68,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
- explicit GroupPrimitive2D(const Primitive2DContainer& rChildren);
+ explicit GroupPrimitive2D(Primitive2DContainer&& aChildren);
/// data read access
const Primitive2DContainer& getChildren() const { return maChildren; }
diff --git a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
index afcb127f0e81..3a13d2ab4d11 100644
--- a/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx
@@ -37,7 +37,7 @@ namespace drawinglayer::primitive2d
class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive2D final : public GroupPrimitive2D
{
public:
- explicit HiddenGeometryPrimitive2D(const Primitive2DContainer& rChildren);
+ explicit HiddenGeometryPrimitive2D(Primitive2DContainer&& aChildren);
// despite returning an empty decomposition since it's no visualisation data,
// range calculation is intended to use hidden geometry, so
diff --git a/include/drawinglayer/primitive2d/invertprimitive2d.hxx b/include/drawinglayer/primitive2d/invertprimitive2d.hxx
index b190e35ff134..ccafd51561a6 100644
--- a/include/drawinglayer/primitive2d/invertprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/invertprimitive2d.hxx
@@ -40,7 +40,7 @@ namespace drawinglayer::primitive2d
{
public:
/// constructor
- explicit InvertPrimitive2D(const Primitive2DContainer& rChildren);
+ explicit InvertPrimitive2D(Primitive2DContainer&& aChildren);
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
diff --git a/include/drawinglayer/primitive2d/maskprimitive2d.hxx b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
index b2be9ae89cd5..e2d8c0e65249 100644
--- a/include/drawinglayer/primitive2d/maskprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/maskprimitive2d.hxx
@@ -51,7 +51,7 @@ namespace drawinglayer::primitive2d
/// constructor
MaskPrimitive2D(
const basegfx::B2DPolyPolygon& rMask,
- const Primitive2DContainer& rChildren);
+ Primitive2DContainer&& aChildren);
/// data read access
const basegfx::B2DPolyPolygon& getMask() const { return maMask; }
diff --git a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
index 720e327e2889..167ed054fa6e 100644
--- a/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
@@ -53,7 +53,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
ModifiedColorPrimitive2D(
- const Primitive2DContainer& rChildren,
+ Primitive2DContainer&& aChildren,
const basegfx::BColorModifierSharedPtr& rColorModifier);
/// data read access
diff --git a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
index 64db475a0e6c..9df931a96997 100644
--- a/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
@@ -43,7 +43,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
ObjectInfoPrimitive2D(
- const Primitive2DContainer& rChildren,
+ Primitive2DContainer&& aChildren,
const OUString& rName,
const OUString& rTitle,
const OUString& rDesc);
diff --git a/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx
index f1842100d68a..8b6a08aa7fc0 100644
--- a/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx
@@ -35,7 +35,7 @@ namespace drawinglayer::primitive2d
private:
public:
/// constructor
- explicit PageHierarchyPrimitive2D(const Primitive2DContainer& rChildren);
+ explicit PageHierarchyPrimitive2D(Primitive2DContainer&& aChildren);
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
index 37258d8f34ed..7df83a395f19 100644
--- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
@@ -61,7 +61,7 @@ namespace drawinglayer::primitive2d
const basegfx::B2DHomMatrix& rShadowTransform,
const basegfx::BColor& rShadowColor,
double fShadowBlur,
- const Primitive2DContainer& rChildren);
+ Primitive2DContainer&& aChildren);
/// data read access
const basegfx::B2DHomMatrix& getShadowTransform() const { return maShadowTransform; }
diff --git a/include/drawinglayer/primitive2d/softedgeprimitive2d.hxx b/include/drawinglayer/primitive2d/softedgeprimitive2d.hxx
index f16e50287b0e..90ada61f7b2e 100644
--- a/include/drawinglayer/primitive2d/softedgeprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/softedgeprimitive2d.hxx
@@ -32,7 +32,7 @@ private:
mutable bool mbInMaskGeneration = false;
public:
- SoftEdgePrimitive2D(double fRadius, const Primitive2DContainer& rChildren);
+ SoftEdgePrimitive2D(double fRadius, Primitive2DContainer&& aChildren);
double getRadius() const { return mfRadius; }
diff --git a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
index 17417f03c83a..c129e49d7800 100644
--- a/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/structuretagprimitive2d.hxx
@@ -56,7 +56,7 @@ namespace drawinglayer::primitive2d
const vcl::PDFWriter::StructElement& rStructureElement,
bool bBackground,
bool bIsImage,
- const Primitive2DContainer& rChildren);
+ Primitive2DContainer&& aChildren);
/// data read access
const vcl::PDFWriter::StructElement& getStructureElement() const { return maStructureElement; }
diff --git a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index 36fcb70677a8..00972a2843df 100644
--- a/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -41,7 +41,7 @@ namespace drawinglayer::primitive2d
private:
public:
/// constructor
- explicit TextHierarchyLinePrimitive2D(const Primitive2DContainer& rChildren);
+ explicit TextHierarchyLinePrimitive2D(Primitive2DContainer&& aChildren);
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
@@ -56,7 +56,7 @@ namespace drawinglayer::primitive2d
private:
public:
/// constructor
- explicit TextHierarchyBulletPrimitive2D(const Primitive2DContainer& rChildren);
+ explicit TextHierarchyBulletPrimitive2D(Primitive2DContainer&& aChildren);
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
@@ -76,7 +76,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
explicit TextHierarchyParagraphPrimitive2D(
- const Primitive2DContainer& rChildren,
+ Primitive2DContainer&& aChildren,
sal_Int16 nOutlineLevel = -1);
/// data read access
@@ -98,7 +98,7 @@ namespace drawinglayer::primitive2d
private:
public:
/// constructor
- explicit TextHierarchyBlockPrimitive2D(const Primitive2DContainer& rChildren);
+ explicit TextHierarchyBlockPrimitive2D(Primitive2DContainer&& aChildren);
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
@@ -138,7 +138,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
TextHierarchyFieldPrimitive2D(
- const Primitive2DContainer& rChildren,
+ Primitive2DContainer&& aChildren,
const FieldType& rFieldType,
const std::vector< std::pair< OUString, OUString>>* pNameValue = nullptr);
@@ -168,7 +168,7 @@ namespace drawinglayer::primitive2d
private:
public:
/// constructor
- explicit TextHierarchyEditPrimitive2D(const Primitive2DContainer& rChildren);
+ explicit TextHierarchyEditPrimitive2D(Primitive2DContainer&& aChildren);
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
diff --git a/include/drawinglayer/primitive2d/transformprimitive2d.hxx b/include/drawinglayer/primitive2d/transformprimitive2d.hxx
index 25549e633ad9..c1b620fc7628 100644
--- a/include/drawinglayer/primitive2d/transformprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/transformprimitive2d.hxx
@@ -56,7 +56,7 @@ namespace drawinglayer::primitive2d
/// constructor
TransformPrimitive2D(
const basegfx::B2DHomMatrix& rTransformation,
- const Primitive2DContainer& rChildren);
+ Primitive2DContainer&& rChildren);
/// data read access
const basegfx::B2DHomMatrix& getTransformation() const { return maTransformation; }
diff --git a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
index 3527715783a1..14658abe3dd4 100644
--- a/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/transparenceprimitive2d.hxx
@@ -62,8 +62,8 @@ namespace drawinglayer::primitive2d
using the common RGB_to_luminance definitions
*/
TransparencePrimitive2D(
- const Primitive2DContainer& rChildren,
- const Primitive2DContainer& rTransparence);
+ Primitive2DContainer&& rChildren,
+ Primitive2DContainer&& aTransparence);
/// data read access
const Primitive2DContainer& getTransparence() const { return maTransparence; }
diff --git a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
index caeac986cde6..b5a75f295cbe 100644
--- a/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx
@@ -44,7 +44,7 @@ namespace drawinglayer::primitive2d
public:
/// constructor
UnifiedTransparencePrimitive2D(
- const Primitive2DContainer& rChildren,
+ Primitive2DContainer&& rChildren,
double fTransparence);
/// data read access