diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2016-04-29 17:10:18 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2016-05-01 13:46:04 +0000 |
| commit | 75d9f7a4332f8dec141159c88fe70a9f18a5daae (patch) | |
| tree | c702d5a6b40ca6688f359f26fe2b79b3237df39c /include | |
| parent | 0975b5e4bdcd564b38b244589a44f5dd6cbdc63d (diff) | |
Complete drawinglayer attributes
All DrawingLayer Atrributes used for ptimitives need a default
constructor. Since the o3tl::cow_wrapper is used in combination
with a static default incarnation of the impl class it is better
to define that. Also needed is a working isDefault() implementation
that compares the impl class to the static default. Added missing
stuff for this.
Change-Id: I98e9fee7343112cd979b972229423ac0ef3994a6
Reviewed-on: https://gerrit.libreoffice.org/24496
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'include')
4 files changed, 14 insertions, 0 deletions
diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx index 1b35189a6993..82c183f6a486 100644 --- a/include/drawinglayer/attribute/fontattribute.hxx +++ b/include/drawinglayer/attribute/fontattribute.hxx @@ -71,6 +71,9 @@ namespace drawinglayer FontAttribute& operator=(const FontAttribute& rCandidate); ~FontAttribute(); + // checks if the incarnation is default constructed + bool isDefault() const; + // compare operator bool operator==(const FontAttribute& rCandidate) const; diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx b/include/drawinglayer/attribute/materialattribute3d.hxx index db144b7a030a..e5d3f68bef55 100644 --- a/include/drawinglayer/attribute/materialattribute3d.hxx +++ b/include/drawinglayer/attribute/materialattribute3d.hxx @@ -59,6 +59,9 @@ namespace drawinglayer MaterialAttribute3D(const MaterialAttribute3D& rCandidate); ~MaterialAttribute3D(); + // checks if the incarnation is default constructed + bool isDefault() const; + // assignment operator MaterialAttribute3D& operator=(const MaterialAttribute3D& rCandidate); diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx b/include/drawinglayer/attribute/sdrlightattribute3d.hxx index 3b98b464ec76..49b9685b6177 100644 --- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -56,11 +56,15 @@ namespace drawinglayer bool bSpecular); explicit Sdr3DLightAttribute(const basegfx::BColor& rColor); Sdr3DLightAttribute(const Sdr3DLightAttribute& rCandidate); + Sdr3DLightAttribute(); ~Sdr3DLightAttribute(); // assignment operator Sdr3DLightAttribute& operator=(const Sdr3DLightAttribute& rCandidate); + // checks if the incarnation is default constructed + bool isDefault() const; + // compare operator bool operator==(const Sdr3DLightAttribute& rCandidate) const; diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx index b4ea75bfbf87..85019eff89b5 100644 --- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -64,11 +64,15 @@ namespace drawinglayer bool bTextureFilter, bool bReducedLineGeometry); Sdr3DObjectAttribute(const Sdr3DObjectAttribute& rCandidate); + Sdr3DObjectAttribute(); ~Sdr3DObjectAttribute(); // assignment operator Sdr3DObjectAttribute& operator=(const Sdr3DObjectAttribute& rCandidate); + // checks if the incarnation is default constructed + bool isDefault() const; + // compare operator bool operator==(const Sdr3DObjectAttribute& rCandidate) const; |