diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-11 18:28:03 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-05-12 15:23:49 +0200 |
commit | 86472954f91342e683e4cafa016bc02387dbbb56 (patch) | |
tree | dcd4eb86d01a86d89094c246495850f3def1fc1f /svx/source/sdr/attribute | |
parent | 0777abafe01eb6c9ba6ed7412e44002c8018d972 (diff) |
Rename attributes to reflect that they represent different effects
... not only shadow.
In preparation to add soft edge effect (tdf#49247).
Change-Id: Ia5b17fff00e1c2d7f717179687dbd44410795a71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94007
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source/sdr/attribute')
-rw-r--r-- | svx/source/sdr/attribute/sdreffectstextattribute.cxx (renamed from svx/source/sdr/attribute/sdrshadowtextattribute.cxx) | 14 | ||||
-rw-r--r-- | svx/source/sdr/attribute/sdrlineeffectstextattribute.cxx (renamed from svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx) | 26 | ||||
-rw-r--r-- | svx/source/sdr/attribute/sdrlinefilleffectstextattribute.cxx (renamed from svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx) | 26 |
3 files changed, 33 insertions, 33 deletions
diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdreffectstextattribute.cxx index b8f48cd1f57e..05775f0beffa 100644 --- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdreffectstextattribute.cxx @@ -18,12 +18,12 @@ */ -#include <sdr/attribute/sdrshadowtextattribute.hxx> +#include <sdr/attribute/sdreffectstextattribute.hxx> namespace drawinglayer::attribute { - SdrShadowTextAttribute::SdrShadowTextAttribute( + SdrEffectsTextAttribute::SdrEffectsTextAttribute( const SdrShadowAttribute& rShadow, const SdrTextAttribute& rTextAttribute, const SdrGlowAttribute& rGlow) @@ -33,20 +33,20 @@ namespace drawinglayer::attribute { } - SdrShadowTextAttribute::SdrShadowTextAttribute() + SdrEffectsTextAttribute::SdrEffectsTextAttribute() : maShadow(), maTextAttribute() { } - SdrShadowTextAttribute::SdrShadowTextAttribute(const SdrShadowTextAttribute& rCandidate) + SdrEffectsTextAttribute::SdrEffectsTextAttribute(const SdrEffectsTextAttribute& rCandidate) : maShadow(rCandidate.getShadow()), maTextAttribute(rCandidate.getText()), maGlow(rCandidate.maGlow) { } - SdrShadowTextAttribute& SdrShadowTextAttribute::operator=(const SdrShadowTextAttribute& rCandidate) + SdrEffectsTextAttribute& SdrEffectsTextAttribute::operator=(const SdrEffectsTextAttribute& rCandidate) { maShadow = rCandidate.getShadow(); maTextAttribute = rCandidate.getText(); @@ -55,13 +55,13 @@ namespace drawinglayer::attribute return *this; } - bool SdrShadowTextAttribute::isDefault() const + bool SdrEffectsTextAttribute::isDefault() const { return (getShadow().isDefault() && getText().isDefault() && maGlow.isDefault()); } - bool SdrShadowTextAttribute::operator==(const SdrShadowTextAttribute& rCandidate) const + bool SdrEffectsTextAttribute::operator==(const SdrEffectsTextAttribute& rCandidate) const { return (getShadow() == rCandidate.getShadow() && getText() == rCandidate.getText() diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineeffectstextattribute.cxx index 667a996d1379..a7a5e265427c 100644 --- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineeffectstextattribute.cxx @@ -18,56 +18,56 @@ */ -#include <sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineeffectstextattribute.hxx> namespace drawinglayer::attribute { - SdrLineShadowTextAttribute::SdrLineShadowTextAttribute( + SdrLineEffectsTextAttribute::SdrLineEffectsTextAttribute( const SdrLineAttribute& rLine, const SdrLineStartEndAttribute& rLineStartEnd, const SdrShadowAttribute& rShadow, const SdrTextAttribute& rTextAttribute, const SdrGlowAttribute& rGlow) - : SdrShadowTextAttribute(rShadow, rTextAttribute, rGlow), + : SdrEffectsTextAttribute(rShadow, rTextAttribute, rGlow), maLine(rLine), maLineStartEnd(rLineStartEnd) { } - SdrLineShadowTextAttribute::SdrLineShadowTextAttribute() - : SdrShadowTextAttribute(), + SdrLineEffectsTextAttribute::SdrLineEffectsTextAttribute() + : SdrEffectsTextAttribute(), maLine(), maLineStartEnd() { } - SdrLineShadowTextAttribute::SdrLineShadowTextAttribute(const SdrLineShadowTextAttribute& rCandidate) - : SdrShadowTextAttribute(rCandidate), + SdrLineEffectsTextAttribute::SdrLineEffectsTextAttribute(const SdrLineEffectsTextAttribute& rCandidate) + : SdrEffectsTextAttribute(rCandidate), maLine(rCandidate.getLine()), maLineStartEnd(rCandidate.getLineStartEnd()) { } - SdrLineShadowTextAttribute& SdrLineShadowTextAttribute::operator=(const SdrLineShadowTextAttribute& rCandidate) + SdrLineEffectsTextAttribute& SdrLineEffectsTextAttribute::operator=(const SdrLineEffectsTextAttribute& rCandidate) { - SdrShadowTextAttribute::operator=(rCandidate); + SdrEffectsTextAttribute::operator=(rCandidate); maLine = rCandidate.getLine(); maLineStartEnd = rCandidate.getLineStartEnd(); return *this; } - bool SdrLineShadowTextAttribute::isDefault() const + bool SdrLineEffectsTextAttribute::isDefault() const { - return(SdrShadowTextAttribute::isDefault() + return(SdrEffectsTextAttribute::isDefault() && getLine().isDefault() && getLineStartEnd().isDefault()); } - bool SdrLineShadowTextAttribute::operator==(const SdrLineShadowTextAttribute& rCandidate) const + bool SdrLineEffectsTextAttribute::operator==(const SdrLineEffectsTextAttribute& rCandidate) const { - return(SdrShadowTextAttribute::operator==(rCandidate) + return(SdrEffectsTextAttribute::operator==(rCandidate) && getLine() == rCandidate.getLine() && getLineStartEnd() == rCandidate.getLineStartEnd()); } diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefilleffectstextattribute.cxx index 9ecbf331961e..6200b7b51308 100644 --- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefilleffectstextattribute.cxx @@ -18,12 +18,12 @@ */ -#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefilleffectstextattribute.hxx> namespace drawinglayer::attribute { - SdrLineFillShadowTextAttribute::SdrLineFillShadowTextAttribute( + SdrLineFillEffectsTextAttribute::SdrLineFillEffectsTextAttribute( const SdrLineAttribute& rLine, const SdrFillAttribute& rFill, const SdrLineStartEndAttribute& rLineStartEnd, @@ -31,45 +31,45 @@ namespace drawinglayer::attribute const FillGradientAttribute& rFillFloatTransGradient, const SdrTextAttribute& rTextAttribute, const SdrGlowAttribute& rGlow) - : SdrLineShadowTextAttribute(rLine, rLineStartEnd, rShadow, rTextAttribute, rGlow), + : SdrLineEffectsTextAttribute(rLine, rLineStartEnd, rShadow, rTextAttribute, rGlow), maFill(rFill), maFillFloatTransGradient(rFillFloatTransGradient) { } - SdrLineFillShadowTextAttribute::SdrLineFillShadowTextAttribute() - : SdrLineShadowTextAttribute(), + SdrLineFillEffectsTextAttribute::SdrLineFillEffectsTextAttribute() + : SdrLineEffectsTextAttribute(), maFill(), maFillFloatTransGradient() { } - SdrLineFillShadowTextAttribute::SdrLineFillShadowTextAttribute(const SdrLineFillShadowTextAttribute& rCandidate) - : SdrLineShadowTextAttribute(rCandidate), + SdrLineFillEffectsTextAttribute::SdrLineFillEffectsTextAttribute(const SdrLineFillEffectsTextAttribute& rCandidate) + : SdrLineEffectsTextAttribute(rCandidate), maFill(rCandidate.getFill()), maFillFloatTransGradient(rCandidate.getFillFloatTransGradient()) { } - SdrLineFillShadowTextAttribute& SdrLineFillShadowTextAttribute::operator=(const SdrLineFillShadowTextAttribute& rCandidate) + SdrLineFillEffectsTextAttribute& SdrLineFillEffectsTextAttribute::operator=(const SdrLineFillEffectsTextAttribute& rCandidate) { - SdrLineShadowTextAttribute::operator=(rCandidate); + SdrLineEffectsTextAttribute::operator=(rCandidate); maFill = rCandidate.getFill(); maFillFloatTransGradient = rCandidate.getFillFloatTransGradient(); return *this; } - bool SdrLineFillShadowTextAttribute::isDefault() const + bool SdrLineFillEffectsTextAttribute::isDefault() const { - return (SdrLineShadowTextAttribute::isDefault() + return (SdrLineEffectsTextAttribute::isDefault() && getFill().isDefault() && getFillFloatTransGradient().isDefault()); } - bool SdrLineFillShadowTextAttribute::operator==(const SdrLineFillShadowTextAttribute& rCandidate) const + bool SdrLineFillEffectsTextAttribute::operator==(const SdrLineFillEffectsTextAttribute& rCandidate) const { - return(SdrLineShadowTextAttribute::operator==(rCandidate) + return(SdrLineEffectsTextAttribute::operator==(rCandidate) && getFill() == rCandidate.getFill() && getFillFloatTransGradient() == rCandidate.getFillFloatTransGradient()); } |