drawinglayer/source/attribute/fillgradientattribute.cxx | 26 ++--------- drawinglayer/source/attribute/fillgraphicattribute.cxx | 15 +----- drawinglayer/source/attribute/fillhatchattribute.cxx | 26 ++--------- drawinglayer/source/attribute/fontattribute.cxx | 26 ++--------- drawinglayer/source/attribute/lineattribute.cxx | 15 +----- drawinglayer/source/attribute/linestartendattribute.cxx | 15 +----- drawinglayer/source/attribute/materialattribute3d.cxx | 15 +----- drawinglayer/source/attribute/sdrfillattribute.cxx | 26 ++--------- drawinglayer/source/attribute/sdrfillgraphicattribute.cxx | 26 ++--------- drawinglayer/source/attribute/sdrlightattribute3d.cxx | 15 +----- drawinglayer/source/attribute/sdrlightingattribute3d.cxx | 27 ++---------- drawinglayer/source/attribute/sdrlineattribute.cxx | 26 ++--------- drawinglayer/source/attribute/sdrlinestartendattribute.cxx | 26 ++--------- drawinglayer/source/attribute/sdrobjectattribute3d.cxx | 15 +----- drawinglayer/source/attribute/sdrsceneattribute3d.cxx | 26 ++--------- drawinglayer/source/attribute/sdrshadowattribute.cxx | 26 ++--------- drawinglayer/source/attribute/strokeattribute.cxx | 26 ++--------- drawinglayer/source/geometry/viewinformation2d.cxx | 26 ++--------- drawinglayer/source/geometry/viewinformation3d.cxx | 26 ++--------- include/drawinglayer/attribute/fillgradientattribute.hxx | 8 +-- include/drawinglayer/attribute/fillgraphicattribute.hxx | 4 - include/drawinglayer/attribute/fillhatchattribute.hxx | 8 +-- include/drawinglayer/attribute/fontattribute.hxx | 8 +-- include/drawinglayer/attribute/lineattribute.hxx | 4 - include/drawinglayer/attribute/linestartendattribute.hxx | 4 - include/drawinglayer/attribute/materialattribute3d.hxx | 4 - include/drawinglayer/attribute/sdrfillattribute.hxx | 8 +-- include/drawinglayer/attribute/sdrfillgraphicattribute.hxx | 8 +-- include/drawinglayer/attribute/sdrlightattribute3d.hxx | 4 - include/drawinglayer/attribute/sdrlineattribute.hxx | 8 +-- include/drawinglayer/attribute/sdrlinestartendattribute.hxx | 8 +-- include/drawinglayer/attribute/sdrobjectattribute3d.hxx | 4 - include/drawinglayer/attribute/sdrsceneattribute3d.hxx | 8 +-- include/drawinglayer/attribute/sdrshadowattribute.hxx | 8 +-- include/drawinglayer/attribute/strokeattribute.hxx | 8 +-- include/drawinglayer/geometry/viewinformation2d.hxx | 8 +-- include/drawinglayer/geometry/viewinformation3d.hxx | 8 +-- 37 files changed, 144 insertions(+), 405 deletions(-)
New commits: commit 8010abe4ab300f966b878b64ccc8733e3ea3cbc4 Author: Jochen Nitschke <j.nitschke+loger...@ok.de> Date: Sun Jan 28 20:18:12 2018 +0100 clang-tidy modernize-use-equals-default in drawinglayer Change-Id: I2fbcac7a22a881681bc8b84274e7d39f1cec18bf Reviewed-on: https://gerrit.libreoffice.org/48800 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx b/drawinglayer/source/attribute/fillgradientattribute.cxx index 941f311e1ac5..e4931abab825 100644 --- a/drawinglayer/source/attribute/fillgradientattribute.cxx +++ b/drawinglayer/source/attribute/fillgradientattribute.cxx @@ -119,36 +119,20 @@ namespace drawinglayer { } - FillGradientAttribute::FillGradientAttribute(const FillGradientAttribute& rCandidate) - : mpFillGradientAttribute(rCandidate.mpFillGradientAttribute) - { - } + FillGradientAttribute::FillGradientAttribute(const FillGradientAttribute&) = default; - FillGradientAttribute::FillGradientAttribute(FillGradientAttribute&& rCandidate) - : mpFillGradientAttribute(std::move(rCandidate.mpFillGradientAttribute)) - { - } + FillGradientAttribute::FillGradientAttribute(FillGradientAttribute&&) = default; - FillGradientAttribute::~FillGradientAttribute() - { - } + FillGradientAttribute::~FillGradientAttribute() = default; bool FillGradientAttribute::isDefault() const { return mpFillGradientAttribute.same_object(theGlobalDefault::get()); } - FillGradientAttribute& FillGradientAttribute::operator=(const FillGradientAttribute& rCandidate) - { - mpFillGradientAttribute = rCandidate.mpFillGradientAttribute; - return *this; - } + FillGradientAttribute& FillGradientAttribute::operator=(const FillGradientAttribute&) = default; - FillGradientAttribute& FillGradientAttribute::operator=(FillGradientAttribute&& rCandidate) - { - mpFillGradientAttribute = std::move(rCandidate.mpFillGradientAttribute); - return *this; - } + FillGradientAttribute& FillGradientAttribute::operator=(FillGradientAttribute&&) = default; bool FillGradientAttribute::operator==(const FillGradientAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/fillgraphicattribute.cxx b/drawinglayer/source/attribute/fillgraphicattribute.cxx index b0dba109a166..867fecd79b52 100644 --- a/drawinglayer/source/attribute/fillgraphicattribute.cxx +++ b/drawinglayer/source/attribute/fillgraphicattribute.cxx @@ -103,25 +103,16 @@ namespace drawinglayer { } - FillGraphicAttribute::FillGraphicAttribute(const FillGraphicAttribute& rCandidate) - : mpFillGraphicAttribute(rCandidate.mpFillGraphicAttribute) - { - } + FillGraphicAttribute::FillGraphicAttribute(const FillGraphicAttribute&) = default; - FillGraphicAttribute::~FillGraphicAttribute() - { - } + FillGraphicAttribute::~FillGraphicAttribute() = default; bool FillGraphicAttribute::isDefault() const { return mpFillGraphicAttribute.same_object(theGlobalDefault::get()); } - FillGraphicAttribute& FillGraphicAttribute::operator=(const FillGraphicAttribute& rCandidate) - { - mpFillGraphicAttribute = rCandidate.mpFillGraphicAttribute; - return *this; - } + FillGraphicAttribute& FillGraphicAttribute::operator=(const FillGraphicAttribute&) = default; bool FillGraphicAttribute::operator==(const FillGraphicAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx b/drawinglayer/source/attribute/fillhatchattribute.cxx index 4870202defef..03399892ddbf 100644 --- a/drawinglayer/source/attribute/fillhatchattribute.cxx +++ b/drawinglayer/source/attribute/fillhatchattribute.cxx @@ -107,36 +107,20 @@ namespace drawinglayer { } - FillHatchAttribute::FillHatchAttribute(const FillHatchAttribute& rCandidate) - : mpFillHatchAttribute(rCandidate.mpFillHatchAttribute) - { - } + FillHatchAttribute::FillHatchAttribute(const FillHatchAttribute&) = default; - FillHatchAttribute::FillHatchAttribute(FillHatchAttribute&& rCandidate) - : mpFillHatchAttribute(std::move(rCandidate.mpFillHatchAttribute)) - { - } + FillHatchAttribute::FillHatchAttribute(FillHatchAttribute&&) = default; - FillHatchAttribute::~FillHatchAttribute() - { - } + FillHatchAttribute::~FillHatchAttribute() = default; bool FillHatchAttribute::isDefault() const { return mpFillHatchAttribute.same_object(theGlobalDefault::get()); } - FillHatchAttribute& FillHatchAttribute::operator=(const FillHatchAttribute& rCandidate) - { - mpFillHatchAttribute = rCandidate.mpFillHatchAttribute; - return *this; - } + FillHatchAttribute& FillHatchAttribute::operator=(const FillHatchAttribute&) = default; - FillHatchAttribute& FillHatchAttribute::operator=(FillHatchAttribute&& rCandidate) - { - mpFillHatchAttribute = std::move(rCandidate.mpFillHatchAttribute); - return *this; - } + FillHatchAttribute& FillHatchAttribute::operator=(FillHatchAttribute&&) = default; bool FillHatchAttribute::operator==(const FillHatchAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx index ed7d3a6ad512..37b73bf2bc4a 100644 --- a/drawinglayer/source/attribute/fontattribute.cxx +++ b/drawinglayer/source/attribute/fontattribute.cxx @@ -134,31 +134,15 @@ namespace drawinglayer { } - FontAttribute::FontAttribute(const FontAttribute& rCandidate) - : mpFontAttribute(rCandidate.mpFontAttribute) - { - } + FontAttribute::FontAttribute(const FontAttribute&) = default; - FontAttribute::FontAttribute(FontAttribute&& rCandidate) - : mpFontAttribute(std::move(rCandidate.mpFontAttribute)) - { - } + FontAttribute::FontAttribute(FontAttribute&&) = default; - FontAttribute::~FontAttribute() - { - } + FontAttribute::~FontAttribute() = default; - FontAttribute& FontAttribute::operator=(const FontAttribute& rCandidate) - { - mpFontAttribute = rCandidate.mpFontAttribute; - return *this; - } + FontAttribute& FontAttribute::operator=(const FontAttribute&) = default; - FontAttribute& FontAttribute::operator=(FontAttribute&& rCandidate) - { - mpFontAttribute = std::move(rCandidate.mpFontAttribute); - return *this; - } + FontAttribute& FontAttribute::operator=(FontAttribute&&) = default; bool FontAttribute::operator==(const FontAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx index 89ce998924fe..583f1a1adfba 100644 --- a/drawinglayer/source/attribute/lineattribute.cxx +++ b/drawinglayer/source/attribute/lineattribute.cxx @@ -103,25 +103,16 @@ namespace drawinglayer { } - LineAttribute::LineAttribute(const LineAttribute& rCandidate) - : mpLineAttribute(rCandidate.mpLineAttribute) - { - } + LineAttribute::LineAttribute(const LineAttribute&) = default; - LineAttribute::~LineAttribute() - { - } + LineAttribute::~LineAttribute() = default; bool LineAttribute::isDefault() const { return mpLineAttribute.same_object(theGlobalDefault::get()); } - LineAttribute& LineAttribute::operator=(const LineAttribute& rCandidate) - { - mpLineAttribute = rCandidate.mpLineAttribute; - return *this; - } + LineAttribute& LineAttribute::operator=(const LineAttribute&) = default; bool LineAttribute::operator==(const LineAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx index 1c0c91c5fd5b..1779b1e44148 100644 --- a/drawinglayer/source/attribute/linestartendattribute.cxx +++ b/drawinglayer/source/attribute/linestartendattribute.cxx @@ -86,25 +86,16 @@ namespace drawinglayer { } - LineStartEndAttribute::LineStartEndAttribute(const LineStartEndAttribute& rCandidate) - : mpLineStartEndAttribute(rCandidate.mpLineStartEndAttribute) - { - } + LineStartEndAttribute::LineStartEndAttribute(const LineStartEndAttribute&) = default; - LineStartEndAttribute::~LineStartEndAttribute() - { - } + LineStartEndAttribute::~LineStartEndAttribute() = default; bool LineStartEndAttribute::isDefault() const { return mpLineStartEndAttribute.same_object(theGlobalDefault::get()); } - LineStartEndAttribute& LineStartEndAttribute::operator=(const LineStartEndAttribute& rCandidate) - { - mpLineStartEndAttribute = rCandidate.mpLineStartEndAttribute; - return *this; - } + LineStartEndAttribute& LineStartEndAttribute::operator=(const LineStartEndAttribute&) = default; bool LineStartEndAttribute::operator==(const LineStartEndAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx index 59d39a07265e..7172dec3d89d 100644 --- a/drawinglayer/source/attribute/materialattribute3d.cxx +++ b/drawinglayer/source/attribute/materialattribute3d.cxx @@ -101,20 +101,11 @@ namespace drawinglayer { } - MaterialAttribute3D::MaterialAttribute3D(const MaterialAttribute3D& rCandidate) - : mpMaterialAttribute3D(rCandidate.mpMaterialAttribute3D) - { - } + MaterialAttribute3D::MaterialAttribute3D(const MaterialAttribute3D&) = default; - MaterialAttribute3D::~MaterialAttribute3D() - { - } + MaterialAttribute3D::~MaterialAttribute3D() = default; - MaterialAttribute3D& MaterialAttribute3D::operator=(const MaterialAttribute3D& rCandidate) - { - mpMaterialAttribute3D = rCandidate.mpMaterialAttribute3D; - return *this; - } + MaterialAttribute3D& MaterialAttribute3D::operator=(const MaterialAttribute3D&) = default; bool MaterialAttribute3D::operator==(const MaterialAttribute3D& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrfillattribute.cxx b/drawinglayer/source/attribute/sdrfillattribute.cxx index 003f0a30bd3a..e39dfcc02370 100644 --- a/drawinglayer/source/attribute/sdrfillattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillattribute.cxx @@ -103,36 +103,20 @@ namespace drawinglayer { } - SdrFillAttribute::SdrFillAttribute(const SdrFillAttribute& rCandidate) - : mpSdrFillAttribute(rCandidate.mpSdrFillAttribute) - { - } + SdrFillAttribute::SdrFillAttribute(const SdrFillAttribute&) = default; - SdrFillAttribute::SdrFillAttribute(SdrFillAttribute&& rCandidate) - : mpSdrFillAttribute(std::move(rCandidate.mpSdrFillAttribute)) - { - } + SdrFillAttribute::SdrFillAttribute(SdrFillAttribute&&) = default; - SdrFillAttribute::~SdrFillAttribute() - { - } + SdrFillAttribute::~SdrFillAttribute() = default; bool SdrFillAttribute::isDefault() const { return mpSdrFillAttribute.same_object(theGlobalDefault::get()); } - SdrFillAttribute& SdrFillAttribute::operator=(const SdrFillAttribute& rCandidate) - { - mpSdrFillAttribute = rCandidate.mpSdrFillAttribute; - return *this; - } + SdrFillAttribute& SdrFillAttribute::operator=(const SdrFillAttribute&) = default; - SdrFillAttribute& SdrFillAttribute::operator=(SdrFillAttribute&& rCandidate) - { - mpSdrFillAttribute = std::move(rCandidate.mpSdrFillAttribute); - return *this; - } + SdrFillAttribute& SdrFillAttribute::operator=(SdrFillAttribute&&) = default; bool SdrFillAttribute::operator==(const SdrFillAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx index 79a35a257dc2..f1bce0064dd8 100644 --- a/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillgraphicattribute.cxx @@ -136,36 +136,20 @@ namespace drawinglayer { } - SdrFillGraphicAttribute::SdrFillGraphicAttribute(const SdrFillGraphicAttribute& rCandidate) - : mpSdrFillGraphicAttribute(rCandidate.mpSdrFillGraphicAttribute) - { - } + SdrFillGraphicAttribute::SdrFillGraphicAttribute(const SdrFillGraphicAttribute&) = default; - SdrFillGraphicAttribute::SdrFillGraphicAttribute(SdrFillGraphicAttribute&& rCandidate) - : mpSdrFillGraphicAttribute(std::move(rCandidate.mpSdrFillGraphicAttribute)) - { - } + SdrFillGraphicAttribute::SdrFillGraphicAttribute(SdrFillGraphicAttribute&&) = default; - SdrFillGraphicAttribute::~SdrFillGraphicAttribute() - { - } + SdrFillGraphicAttribute::~SdrFillGraphicAttribute() = default; bool SdrFillGraphicAttribute::isDefault() const { return mpSdrFillGraphicAttribute.same_object(theGlobalDefault::get()); } - SdrFillGraphicAttribute& SdrFillGraphicAttribute::operator=(const SdrFillGraphicAttribute& rCandidate) - { - mpSdrFillGraphicAttribute = rCandidate.mpSdrFillGraphicAttribute; - return *this; - } + SdrFillGraphicAttribute& SdrFillGraphicAttribute::operator=(const SdrFillGraphicAttribute&) = default; - SdrFillGraphicAttribute& SdrFillGraphicAttribute::operator=(SdrFillGraphicAttribute&& rCandidate) - { - mpSdrFillGraphicAttribute = std::move(rCandidate.mpSdrFillGraphicAttribute); - return *this; - } + SdrFillGraphicAttribute& SdrFillGraphicAttribute::operator=(SdrFillGraphicAttribute&&) = default; bool SdrFillGraphicAttribute::operator==(const SdrFillGraphicAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx index ddbb2633ee17..6f33b0c1c044 100644 --- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx @@ -74,20 +74,11 @@ namespace drawinglayer { } - Sdr3DLightAttribute::Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate) - : mpSdr3DLightAttribute(rCandidate.mpSdr3DLightAttribute) - { - } + Sdr3DLightAttribute::Sdr3DLightAttribute(const Sdr3DLightAttribute&) = default; - Sdr3DLightAttribute::~Sdr3DLightAttribute() - { - } + Sdr3DLightAttribute::~Sdr3DLightAttribute() = default; - Sdr3DLightAttribute& Sdr3DLightAttribute::operator=(const Sdr3DLightAttribute& rCandidate) - { - mpSdr3DLightAttribute = rCandidate.mpSdr3DLightAttribute; - return *this; - } + Sdr3DLightAttribute& Sdr3DLightAttribute::operator=(const Sdr3DLightAttribute&) = default; bool Sdr3DLightAttribute::operator==(const Sdr3DLightAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx index d4ac015c4fb9..8ead71e47b6e 100644 --- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx @@ -79,36 +79,21 @@ namespace drawinglayer { } - SdrLightingAttribute::SdrLightingAttribute(const SdrLightingAttribute& rCandidate) - : mpSdrLightingAttribute(rCandidate.mpSdrLightingAttribute) - { - } + SdrLightingAttribute::SdrLightingAttribute(const SdrLightingAttribute&) = default; - SdrLightingAttribute::SdrLightingAttribute(SdrLightingAttribute&& rCandidate) - : mpSdrLightingAttribute(std::move(rCandidate.mpSdrLightingAttribute)) - { - } + SdrLightingAttribute::SdrLightingAttribute(SdrLightingAttribute&&) = default; + + SdrLightingAttribute::~SdrLightingAttribute() = default; - SdrLightingAttribute::~SdrLightingAttribute() - { - } bool SdrLightingAttribute::isDefault() const { return mpSdrLightingAttribute.same_object(theGlobalDefault::get()); } - SdrLightingAttribute& SdrLightingAttribute::operator=(const SdrLightingAttribute& rCandidate) - { - mpSdrLightingAttribute = rCandidate.mpSdrLightingAttribute; - return *this; - } + SdrLightingAttribute& SdrLightingAttribute::operator=(const SdrLightingAttribute&) = default; - SdrLightingAttribute& SdrLightingAttribute::operator=(SdrLightingAttribute&& rCandidate) - { - mpSdrLightingAttribute = std::move(rCandidate.mpSdrLightingAttribute); - return *this; - } + SdrLightingAttribute& SdrLightingAttribute::operator=(SdrLightingAttribute&&) = default; bool SdrLightingAttribute::operator==(const SdrLightingAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx index fa6267c1e958..5b13d37599d2 100644 --- a/drawinglayer/source/attribute/sdrlineattribute.cxx +++ b/drawinglayer/source/attribute/sdrlineattribute.cxx @@ -119,36 +119,20 @@ namespace drawinglayer { } - SdrLineAttribute::SdrLineAttribute(const SdrLineAttribute& rCandidate) - : mpSdrLineAttribute(rCandidate.mpSdrLineAttribute) - { - } + SdrLineAttribute::SdrLineAttribute(const SdrLineAttribute&) = default; - SdrLineAttribute::SdrLineAttribute(SdrLineAttribute&& rCandidate) - : mpSdrLineAttribute(std::move(rCandidate.mpSdrLineAttribute)) - { - } + SdrLineAttribute::SdrLineAttribute(SdrLineAttribute&&) = default; - SdrLineAttribute::~SdrLineAttribute() - { - } + SdrLineAttribute::~SdrLineAttribute() = default; bool SdrLineAttribute::isDefault() const { return mpSdrLineAttribute.same_object(theGlobalDefault::get()); } - SdrLineAttribute& SdrLineAttribute::operator=(const SdrLineAttribute& rCandidate) - { - mpSdrLineAttribute = rCandidate.mpSdrLineAttribute; - return *this; - } + SdrLineAttribute& SdrLineAttribute::operator=(const SdrLineAttribute&) = default; - SdrLineAttribute& SdrLineAttribute::operator=(SdrLineAttribute&& rCandidate) - { - mpSdrLineAttribute = std::move(rCandidate.mpSdrLineAttribute); - return *this; - } + SdrLineAttribute& SdrLineAttribute::operator=(SdrLineAttribute&&) = default; bool SdrLineAttribute::operator==(const SdrLineAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx index 370db4f5a8ef..b890132f39b6 100644 --- a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx +++ b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx @@ -120,36 +120,20 @@ namespace drawinglayer { } - SdrLineStartEndAttribute::SdrLineStartEndAttribute(const SdrLineStartEndAttribute& rCandidate) - : mpSdrLineStartEndAttribute(rCandidate.mpSdrLineStartEndAttribute) - { - } + SdrLineStartEndAttribute::SdrLineStartEndAttribute(const SdrLineStartEndAttribute&) = default; - SdrLineStartEndAttribute::SdrLineStartEndAttribute(SdrLineStartEndAttribute&& rCandidate) - : mpSdrLineStartEndAttribute(std::move(rCandidate.mpSdrLineStartEndAttribute)) - { - } + SdrLineStartEndAttribute::SdrLineStartEndAttribute(SdrLineStartEndAttribute&&) = default; - SdrLineStartEndAttribute::~SdrLineStartEndAttribute() - { - } + SdrLineStartEndAttribute::~SdrLineStartEndAttribute() = default; bool SdrLineStartEndAttribute::isDefault() const { return mpSdrLineStartEndAttribute.same_object(theGlobalDefault::get()); } - SdrLineStartEndAttribute& SdrLineStartEndAttribute::operator=(const SdrLineStartEndAttribute& rCandidate) - { - mpSdrLineStartEndAttribute = rCandidate.mpSdrLineStartEndAttribute; - return *this; - } + SdrLineStartEndAttribute& SdrLineStartEndAttribute::operator=(const SdrLineStartEndAttribute&) = default; - SdrLineStartEndAttribute& SdrLineStartEndAttribute::operator=(SdrLineStartEndAttribute&& rCandidate) - { - mpSdrLineStartEndAttribute = std::move(rCandidate.mpSdrLineStartEndAttribute); - return *this; - } + SdrLineStartEndAttribute& SdrLineStartEndAttribute::operator=(SdrLineStartEndAttribute&&) = default; bool SdrLineStartEndAttribute::operator==(const SdrLineStartEndAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx index 941d70593bef..bc20ecaab087 100644 --- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx @@ -122,20 +122,11 @@ namespace drawinglayer { } - Sdr3DObjectAttribute::Sdr3DObjectAttribute(const Sdr3DObjectAttribute& rCandidate) - : mpSdr3DObjectAttribute(rCandidate.mpSdr3DObjectAttribute) - { - } + Sdr3DObjectAttribute::Sdr3DObjectAttribute(const Sdr3DObjectAttribute&) = default; - Sdr3DObjectAttribute::~Sdr3DObjectAttribute() - { - } + Sdr3DObjectAttribute::~Sdr3DObjectAttribute() = default; - Sdr3DObjectAttribute& Sdr3DObjectAttribute::operator=(const Sdr3DObjectAttribute& rCandidate) - { - mpSdr3DObjectAttribute = rCandidate.mpSdr3DObjectAttribute; - return *this; - } + Sdr3DObjectAttribute& Sdr3DObjectAttribute::operator=(const Sdr3DObjectAttribute&) = default; bool Sdr3DObjectAttribute::operator==(const Sdr3DObjectAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx index f08b088decb9..494edcb525b6 100644 --- a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx @@ -98,36 +98,20 @@ namespace drawinglayer { } - SdrSceneAttribute::SdrSceneAttribute(const SdrSceneAttribute& rCandidate) - : mpSdrSceneAttribute(rCandidate.mpSdrSceneAttribute) - { - } + SdrSceneAttribute::SdrSceneAttribute(const SdrSceneAttribute&) = default; - SdrSceneAttribute::SdrSceneAttribute(SdrSceneAttribute&& rCandidate) - : mpSdrSceneAttribute(std::move(rCandidate.mpSdrSceneAttribute)) - { - } + SdrSceneAttribute::SdrSceneAttribute(SdrSceneAttribute&&) = default; - SdrSceneAttribute::~SdrSceneAttribute() - { - } + SdrSceneAttribute::~SdrSceneAttribute() = default; bool SdrSceneAttribute::isDefault() const { return mpSdrSceneAttribute.same_object(theGlobalDefault::get()); } - SdrSceneAttribute& SdrSceneAttribute::operator=(const SdrSceneAttribute& rCandidate) - { - mpSdrSceneAttribute = rCandidate.mpSdrSceneAttribute; - return *this; - } + SdrSceneAttribute& SdrSceneAttribute::operator=(const SdrSceneAttribute&) = default; - SdrSceneAttribute& SdrSceneAttribute::operator=(SdrSceneAttribute&& rCandidate) - { - mpSdrSceneAttribute = std::move(rCandidate.mpSdrSceneAttribute); - return *this; - } + SdrSceneAttribute& SdrSceneAttribute::operator=(SdrSceneAttribute&&) = default; bool SdrSceneAttribute::operator==(const SdrSceneAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx b/drawinglayer/source/attribute/sdrshadowattribute.cxx index 41f834f7826c..0075cf4c2ba7 100644 --- a/drawinglayer/source/attribute/sdrshadowattribute.cxx +++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx @@ -86,36 +86,20 @@ namespace drawinglayer { } - SdrShadowAttribute::SdrShadowAttribute(const SdrShadowAttribute& rCandidate) - : mpSdrShadowAttribute(rCandidate.mpSdrShadowAttribute) - { - } + SdrShadowAttribute::SdrShadowAttribute(const SdrShadowAttribute&) = default; - SdrShadowAttribute::SdrShadowAttribute(SdrShadowAttribute&& rCandidate) - : mpSdrShadowAttribute(std::move(rCandidate.mpSdrShadowAttribute)) - { - } + SdrShadowAttribute::SdrShadowAttribute(SdrShadowAttribute&&) = default; - SdrShadowAttribute::~SdrShadowAttribute() - { - } + SdrShadowAttribute::~SdrShadowAttribute() = default; bool SdrShadowAttribute::isDefault() const { return mpSdrShadowAttribute.same_object(theGlobalDefault::get()); } - SdrShadowAttribute& SdrShadowAttribute::operator=(const SdrShadowAttribute& rCandidate) - { - mpSdrShadowAttribute = rCandidate.mpSdrShadowAttribute; - return *this; - } + SdrShadowAttribute& SdrShadowAttribute::operator=(const SdrShadowAttribute&) = default; - SdrShadowAttribute& SdrShadowAttribute::operator=(SdrShadowAttribute&& rCandidate) - { - mpSdrShadowAttribute = std::move(rCandidate.mpSdrShadowAttribute); - return *this; - } + SdrShadowAttribute& SdrShadowAttribute::operator=(SdrShadowAttribute&&) = default; bool SdrShadowAttribute::operator==(const SdrShadowAttribute& rCandidate) const { diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx index 2ff6dd0c106e..547f4dd97ebe 100644 --- a/drawinglayer/source/attribute/strokeattribute.cxx +++ b/drawinglayer/source/attribute/strokeattribute.cxx @@ -87,36 +87,20 @@ namespace drawinglayer { } - StrokeAttribute::StrokeAttribute(const StrokeAttribute& rCandidate) - : mpStrokeAttribute(rCandidate.mpStrokeAttribute) - { - } + StrokeAttribute::StrokeAttribute(const StrokeAttribute&) = default; - StrokeAttribute::StrokeAttribute(StrokeAttribute&& rCandidate) - : mpStrokeAttribute(std::move(rCandidate.mpStrokeAttribute)) - { - } + StrokeAttribute::StrokeAttribute(StrokeAttribute&&) = default; - StrokeAttribute::~StrokeAttribute() - { - } + StrokeAttribute::~StrokeAttribute() = default; bool StrokeAttribute::isDefault() const { return mpStrokeAttribute.same_object(theGlobalDefault::get()); } - StrokeAttribute& StrokeAttribute::operator=(const StrokeAttribute& rCandidate) - { - mpStrokeAttribute = rCandidate.mpStrokeAttribute; - return *this; - } + StrokeAttribute& StrokeAttribute::operator=(const StrokeAttribute&) = default; - StrokeAttribute& StrokeAttribute::operator=(StrokeAttribute&& rCandidate) - { - mpStrokeAttribute = std::move(rCandidate.mpStrokeAttribute); - return *this; - } + StrokeAttribute& StrokeAttribute::operator=(StrokeAttribute&&) = default; bool StrokeAttribute::operator==(const StrokeAttribute& rCandidate) const { diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index 1010508e36b0..c31bdc2d3e49 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -427,31 +427,15 @@ namespace drawinglayer { } - ViewInformation2D::ViewInformation2D(const ViewInformation2D& rCandidate) - : mpViewInformation2D(rCandidate.mpViewInformation2D) - { - } + ViewInformation2D::ViewInformation2D(const ViewInformation2D&) = default; - ViewInformation2D::ViewInformation2D(ViewInformation2D&& rCandidate) - : mpViewInformation2D(std::move(rCandidate.mpViewInformation2D)) - { - } + ViewInformation2D::ViewInformation2D(ViewInformation2D&&) = default; - ViewInformation2D::~ViewInformation2D() - { - } + ViewInformation2D::~ViewInformation2D() = default; - ViewInformation2D& ViewInformation2D::operator=(const ViewInformation2D& rCandidate) - { - mpViewInformation2D = rCandidate.mpViewInformation2D; - return *this; - } + ViewInformation2D& ViewInformation2D::operator=(const ViewInformation2D&) = default; - ViewInformation2D& ViewInformation2D::operator=(ViewInformation2D&& rCandidate) - { - mpViewInformation2D = std::move(rCandidate.mpViewInformation2D); - return *this; - } + ViewInformation2D& ViewInformation2D::operator=(ViewInformation2D&&) = default; bool ViewInformation2D::operator==(const ViewInformation2D& rCandidate) const { diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index a8ababa930aa..96baa396d9cd 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -451,36 +451,20 @@ namespace drawinglayer { } - ViewInformation3D::ViewInformation3D(const ViewInformation3D& rCandidate) - : mpViewInformation3D(rCandidate.mpViewInformation3D) - { - } + ViewInformation3D::ViewInformation3D(const ViewInformation3D&) = default; - ViewInformation3D::ViewInformation3D(ViewInformation3D&& rCandidate) - : mpViewInformation3D(std::move(rCandidate.mpViewInformation3D)) - { - } + ViewInformation3D::ViewInformation3D(ViewInformation3D&&) = default; - ViewInformation3D::~ViewInformation3D() - { - } + ViewInformation3D::~ViewInformation3D() = default; bool ViewInformation3D::isDefault() const { return mpViewInformation3D.same_object(theGlobalDefault::get()); } - ViewInformation3D& ViewInformation3D::operator=(const ViewInformation3D& rCandidate) - { - mpViewInformation3D = rCandidate.mpViewInformation3D; - return *this; - } + ViewInformation3D& ViewInformation3D::operator=(const ViewInformation3D&) = default; - ViewInformation3D& ViewInformation3D::operator=(ViewInformation3D&& rCandidate) - { - mpViewInformation3D = std::move(rCandidate.mpViewInformation3D); - return *this; - } + ViewInformation3D& ViewInformation3D::operator=(ViewInformation3D&&) = default; bool ViewInformation3D::operator==(const ViewInformation3D& rCandidate) const { diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx index 7355b6b461e7..6bea915a8e67 100644 --- a/include/drawinglayer/attribute/fillgradientattribute.hxx +++ b/include/drawinglayer/attribute/fillgradientattribute.hxx @@ -76,10 +76,10 @@ namespace drawinglayer const basegfx::BColor& rEndColor, sal_uInt16 nSteps); FillGradientAttribute(); - FillGradientAttribute(const FillGradientAttribute& rCandidate); - FillGradientAttribute(FillGradientAttribute&& rCandidate); - FillGradientAttribute& operator=(const FillGradientAttribute& rCandidate); - FillGradientAttribute& operator=(FillGradientAttribute&& rCandidate); + FillGradientAttribute(const FillGradientAttribute&); + FillGradientAttribute(FillGradientAttribute&&); + FillGradientAttribute& operator=(const FillGradientAttribute&); + FillGradientAttribute& operator=(FillGradientAttribute&&); ~FillGradientAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx index a2a217445950..971241f5469a 100644 --- a/include/drawinglayer/attribute/fillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx @@ -56,8 +56,8 @@ namespace drawinglayer bool bTiling, double fOffsetX = 0.0, double fOffsetY = 0.0); - FillGraphicAttribute(const FillGraphicAttribute& rCandidate); - FillGraphicAttribute& operator=(const FillGraphicAttribute& rCandidate); + FillGraphicAttribute(const FillGraphicAttribute&); + FillGraphicAttribute& operator=(const FillGraphicAttribute&); ~FillGraphicAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx index 1d08d60e54c2..a4ffe4b656a7 100644 --- a/include/drawinglayer/attribute/fillhatchattribute.hxx +++ b/include/drawinglayer/attribute/fillhatchattribute.hxx @@ -71,10 +71,10 @@ namespace drawinglayer sal_uInt32 nMinimalDiscreteDistance, bool bFillBackground); FillHatchAttribute(); - FillHatchAttribute(const FillHatchAttribute& rCandidate); - FillHatchAttribute(FillHatchAttribute&& rCandidate); - FillHatchAttribute& operator=(const FillHatchAttribute& rCandidate); - FillHatchAttribute& operator=(FillHatchAttribute&& rCandidate); + FillHatchAttribute(const FillHatchAttribute&); + FillHatchAttribute(FillHatchAttribute&&); + FillHatchAttribute& operator=(const FillHatchAttribute&); + FillHatchAttribute& operator=(FillHatchAttribute&&); ~FillHatchAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx index 5b2e791c69f8..5308ababbd24 100644 --- a/include/drawinglayer/attribute/fontattribute.hxx +++ b/include/drawinglayer/attribute/fontattribute.hxx @@ -67,10 +67,10 @@ namespace drawinglayer bool bRTL = false, bool bBiDiStrong = false); FontAttribute(); - FontAttribute(const FontAttribute& rCandidate); - FontAttribute(FontAttribute&& rCandidate); - FontAttribute& operator=(const FontAttribute& rCandidate); - FontAttribute& operator=(FontAttribute&& rCandidate); + FontAttribute(const FontAttribute&); + FontAttribute(FontAttribute&&); + FontAttribute& operator=(const FontAttribute&); + FontAttribute& operator=(FontAttribute&&); ~FontAttribute(); // compare operator diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx index a2ad66d5fe3f..487dbcccf66b 100644 --- a/include/drawinglayer/attribute/lineattribute.hxx +++ b/include/drawinglayer/attribute/lineattribute.hxx @@ -60,8 +60,8 @@ namespace drawinglayer css::drawing::LineCap aLineCap = css::drawing::LineCap_BUTT, double fMiterMinimumAngle = 15.0 * F_PI180); LineAttribute(); - LineAttribute(const LineAttribute& rCandidate); - LineAttribute& operator=(const LineAttribute& rCandidate); + LineAttribute(const LineAttribute&); + LineAttribute& operator=(const LineAttribute&); ~LineAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx b/include/drawinglayer/attribute/linestartendattribute.hxx index 8f348bef5841..1de23c832bd7 100644 --- a/include/drawinglayer/attribute/linestartendattribute.hxx +++ b/include/drawinglayer/attribute/linestartendattribute.hxx @@ -54,8 +54,8 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& rPolyPolygon, bool bCentered); LineStartEndAttribute(); - LineStartEndAttribute(const LineStartEndAttribute& rCandidate); - LineStartEndAttribute& operator=(const LineStartEndAttribute& rCandidate); + LineStartEndAttribute(const LineStartEndAttribute&); + LineStartEndAttribute& operator=(const LineStartEndAttribute&); ~LineStartEndAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx index db144b7a030a..be98af3095bd 100644 --- a/include/drawinglayer/attribute/materialattribute3d.hxx +++ b/include/drawinglayer/attribute/materialattribute3d.hxx @@ -56,11 +56,11 @@ namespace drawinglayer sal_uInt16 nSpecularIntensity); MaterialAttribute3D(const basegfx::BColor& rColor); MaterialAttribute3D(); - MaterialAttribute3D(const MaterialAttribute3D& rCandidate); + MaterialAttribute3D(const MaterialAttribute3D&); ~MaterialAttribute3D(); // assignment operator - MaterialAttribute3D& operator=(const MaterialAttribute3D& rCandidate); + MaterialAttribute3D& operator=(const MaterialAttribute3D&); // compare operator bool operator==(const MaterialAttribute3D& rCandidate) const; diff --git a/include/drawinglayer/attribute/sdrfillattribute.hxx b/include/drawinglayer/attribute/sdrfillattribute.hxx index cb7125725559..54567bb1885c 100644 --- a/include/drawinglayer/attribute/sdrfillattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillattribute.hxx @@ -59,10 +59,10 @@ namespace drawinglayer const FillHatchAttribute& rHatch, const SdrFillGraphicAttribute& rFillGraphic); SdrFillAttribute(); - SdrFillAttribute(const SdrFillAttribute& rCandidate); - SdrFillAttribute(SdrFillAttribute&& rCandidate); - SdrFillAttribute& operator=(const SdrFillAttribute& rCandidate); - SdrFillAttribute& operator=(SdrFillAttribute&& rCandidate); + SdrFillAttribute(const SdrFillAttribute&); + SdrFillAttribute(SdrFillAttribute&&); + SdrFillAttribute& operator=(const SdrFillAttribute&); + SdrFillAttribute& operator=(SdrFillAttribute&&); ~SdrFillAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx index 60e76d87af8c..caebc4adf544 100644 --- a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx @@ -63,10 +63,10 @@ namespace drawinglayer bool bStretch, bool bLogSize); SdrFillGraphicAttribute(); - SdrFillGraphicAttribute(const SdrFillGraphicAttribute& rCandidate); - SdrFillGraphicAttribute(SdrFillGraphicAttribute&& rCandidate); - SdrFillGraphicAttribute& operator=(const SdrFillGraphicAttribute& rCandidate); - SdrFillGraphicAttribute& operator=(SdrFillGraphicAttribute&& rCandidate); + SdrFillGraphicAttribute(const SdrFillGraphicAttribute&); + SdrFillGraphicAttribute(SdrFillGraphicAttribute&&); + SdrFillGraphicAttribute& operator=(const SdrFillGraphicAttribute&); + SdrFillGraphicAttribute& operator=(SdrFillGraphicAttribute&&); ~SdrFillGraphicAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx index 3d91e54d7189..31ee658b3b37 100644 --- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -54,11 +54,11 @@ namespace drawinglayer const basegfx::BColor& rColor, const basegfx::B3DVector& rDirection, bool bSpecular); - Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate); + Sdr3DLightAttribute(const Sdr3DLightAttribute&); ~Sdr3DLightAttribute(); // assignment operator - Sdr3DLightAttribute& operator=(const Sdr3DLightAttribute& rCandidate); + Sdr3DLightAttribute& operator=(const Sdr3DLightAttribute&); // compare operator bool operator==(const Sdr3DLightAttribute& rCandidate) const; diff --git a/include/drawinglayer/attribute/sdrlineattribute.hxx b/include/drawinglayer/attribute/sdrlineattribute.hxx index f57289da0c69..59c9985f1b27 100644 --- a/include/drawinglayer/attribute/sdrlineattribute.hxx +++ b/include/drawinglayer/attribute/sdrlineattribute.hxx @@ -61,10 +61,10 @@ namespace drawinglayer const ::std::vector< double >& rDotDashArray, double fFullDotDashLen); SdrLineAttribute(); - SdrLineAttribute(const SdrLineAttribute& rCandidate); - SdrLineAttribute(SdrLineAttribute&& rCandidate); - SdrLineAttribute& operator=(const SdrLineAttribute& rCandidate); - SdrLineAttribute& operator=(SdrLineAttribute&& rCandidate); + SdrLineAttribute(const SdrLineAttribute&); + SdrLineAttribute(SdrLineAttribute&&); + SdrLineAttribute& operator=(const SdrLineAttribute&); + SdrLineAttribute& operator=(SdrLineAttribute&&); ~SdrLineAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx index e89e74861917..8c14bc24ebda 100644 --- a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -59,10 +59,10 @@ namespace drawinglayer bool bStartCentered, bool bEndCentered); SdrLineStartEndAttribute(); - SdrLineStartEndAttribute(const SdrLineStartEndAttribute& rCandidate); - SdrLineStartEndAttribute(SdrLineStartEndAttribute&& rCandidate); - SdrLineStartEndAttribute& operator=(const SdrLineStartEndAttribute& rCandidate); - SdrLineStartEndAttribute& operator=(SdrLineStartEndAttribute&& rCandidate); + SdrLineStartEndAttribute(const SdrLineStartEndAttribute&); + SdrLineStartEndAttribute(SdrLineStartEndAttribute&&); + SdrLineStartEndAttribute& operator=(const SdrLineStartEndAttribute&); + SdrLineStartEndAttribute& operator=(SdrLineStartEndAttribute&&); ~SdrLineStartEndAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx index b4ea75bfbf87..f0a325d604ad 100644 --- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -63,11 +63,11 @@ namespace drawinglayer bool bShadow3D, bool bTextureFilter, bool bReducedLineGeometry); - Sdr3DObjectAttribute(const Sdr3DObjectAttribute& rCandidate); + Sdr3DObjectAttribute(const Sdr3DObjectAttribute&); ~Sdr3DObjectAttribute(); // assignment operator - Sdr3DObjectAttribute& operator=(const Sdr3DObjectAttribute& rCandidate); + Sdr3DObjectAttribute& operator=(const Sdr3DObjectAttribute&); // compare operator bool operator==(const Sdr3DObjectAttribute& rCandidate) const; diff --git a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx index e25ed77cce15..1e18788b8172 100644 --- a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -55,10 +55,10 @@ namespace drawinglayer css::drawing::ShadeMode aShadeMode, bool bTwoSidedLighting); SdrSceneAttribute(); - SdrSceneAttribute(const SdrSceneAttribute& rCandidate); - SdrSceneAttribute(SdrSceneAttribute&& rCandidate); - SdrSceneAttribute& operator=(const SdrSceneAttribute& rCandidate); - SdrSceneAttribute& operator=(SdrSceneAttribute&& rCandidate); + SdrSceneAttribute(const SdrSceneAttribute&); + SdrSceneAttribute(SdrSceneAttribute&&); + SdrSceneAttribute& operator=(const SdrSceneAttribute&); + SdrSceneAttribute& operator=(SdrSceneAttribute&&); ~SdrSceneAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/sdrshadowattribute.hxx b/include/drawinglayer/attribute/sdrshadowattribute.hxx index 2bb7c13b1bbb..39b5acf59b73 100644 --- a/include/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx @@ -55,10 +55,10 @@ namespace drawinglayer double fTransparence, const basegfx::BColor& rColor); SdrShadowAttribute(); - SdrShadowAttribute(const SdrShadowAttribute& rCandidate); - SdrShadowAttribute(SdrShadowAttribute&& rCandidate); - SdrShadowAttribute& operator=(const SdrShadowAttribute& rCandidate); - SdrShadowAttribute& operator=(SdrShadowAttribute&& rCandidate); + SdrShadowAttribute(const SdrShadowAttribute&); + SdrShadowAttribute(SdrShadowAttribute&&); + SdrShadowAttribute& operator=(const SdrShadowAttribute&); + SdrShadowAttribute& operator=(SdrShadowAttribute&&); ~SdrShadowAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx index 5404158b661c..40e15707b25f 100644 --- a/include/drawinglayer/attribute/strokeattribute.hxx +++ b/include/drawinglayer/attribute/strokeattribute.hxx @@ -50,10 +50,10 @@ namespace drawinglayer const ::std::vector< double >& rDotDashArray, double fFullDotDashLen = 0.0); StrokeAttribute(); - StrokeAttribute(const StrokeAttribute& rCandidate); - StrokeAttribute(StrokeAttribute&& rCandidate); - StrokeAttribute& operator=(const StrokeAttribute& rCandidate); - StrokeAttribute& operator=(StrokeAttribute&& rCandidate); + StrokeAttribute(const StrokeAttribute&); + StrokeAttribute(StrokeAttribute&&); + StrokeAttribute& operator=(const StrokeAttribute&); + StrokeAttribute& operator=(StrokeAttribute&&); ~StrokeAttribute(); // checks if the incarnation is default constructed diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index 08ec2597296e..8769a260f3ef 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -112,16 +112,16 @@ namespace drawinglayer ViewInformation2D(); /// copy constructor - ViewInformation2D(const ViewInformation2D& rCandidate); + ViewInformation2D(const ViewInformation2D&); - ViewInformation2D(ViewInformation2D&& rCandidate); + ViewInformation2D(ViewInformation2D&&); /// destructor ~ViewInformation2D(); /// assignment operator - ViewInformation2D& operator=(const ViewInformation2D& rCandidate); - ViewInformation2D& operator=(ViewInformation2D&& rCandidate); + ViewInformation2D& operator=(const ViewInformation2D&); + ViewInformation2D& operator=(ViewInformation2D&&); /// compare operators bool operator==(const ViewInformation2D& rCandidate) const; diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx index 4d2f82652741..dc3889d87351 100644 --- a/include/drawinglayer/geometry/viewinformation3d.hxx +++ b/include/drawinglayer/geometry/viewinformation3d.hxx @@ -117,9 +117,9 @@ namespace drawinglayer ViewInformation3D(); /// copy constructor - ViewInformation3D(const ViewInformation3D& rCandidate); + ViewInformation3D(const ViewInformation3D&); - ViewInformation3D(ViewInformation3D&& rCandidate); + ViewInformation3D(ViewInformation3D&&); /// destructor ~ViewInformation3D(); @@ -128,8 +128,8 @@ namespace drawinglayer bool isDefault() const; /// assignment operator - ViewInformation3D& operator=(const ViewInformation3D& rCandidate); - ViewInformation3D& operator=(ViewInformation3D&& rCandidate); + ViewInformation3D& operator=(const ViewInformation3D&); + ViewInformation3D& operator=(ViewInformation3D&&); /// compare operators bool operator==(const ViewInformation3D& rCandidate) const; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits