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>

22 files changed, 77 insertions, 77 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());
         }
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 5cfd46b697af..8fceef864ae2 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -73,7 +73,7 @@ namespace sdr::contact
 
         drawinglayer::primitive2d::Primitive2DContainer ViewContactOfGraphic::createVIP2DSForPresObj(
             const basegfx::B2DHomMatrix& rObjectMatrix,
-            const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const
+            const drawinglayer::attribute::SdrLineFillEffectsTextAttribute& rAttribute) const
         {
             drawinglayer::primitive2d::Primitive2DContainer xRetval;
             GraphicObject aEmptyGraphicObject;
@@ -125,7 +125,7 @@ namespace sdr::contact
                 const GraphicAttr aLocalGrafInfo;
                 const drawinglayer::primitive2d::Primitive2DReference xReferenceB(new drawinglayer::primitive2d::SdrGrafPrimitive2D(
                     aSmallerMatrix,
-                    drawinglayer::attribute::SdrLineFillShadowTextAttribute(),
+                    drawinglayer::attribute::SdrLineFillEffectsTextAttribute(),
                     rGraphicObject,
                     aLocalGrafInfo));
 
@@ -137,7 +137,7 @@ namespace sdr::contact
 
         drawinglayer::primitive2d::Primitive2DContainer ViewContactOfGraphic::createVIP2DSForDraft(
             const basegfx::B2DHomMatrix& rObjectMatrix,
-            const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const
+            const drawinglayer::attribute::SdrLineFillEffectsTextAttribute& rAttribute) const
         {
             drawinglayer::primitive2d::Primitive2DContainer xRetval;
             GraphicObject aEmptyGraphicObject;
@@ -303,8 +303,8 @@ namespace sdr::contact
 
             // we have content if graphic is not completely transparent
             const bool bHasContent(255L != aLocalGrafInfo.GetTransparency());
-            drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
-                drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
+            drawinglayer::attribute::SdrLineFillEffectsTextAttribute aAttribute(
+                drawinglayer::primitive2d::createNewSdrLineFillEffectsTextAttribute(
                     rItemSet,
                     GetGrafObject().getText(0),
                     bHasContent));
diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
index f3366f04634f..4b0f06a77ab7 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
@@ -59,8 +59,8 @@ namespace sdr::contact
             drawinglayer::primitive2d::Primitive2DContainer xRetval;
             const SdrCaptionObj& rCaptionObj(static_cast<const SdrCaptionObj&>(GetSdrObject()));
             const SfxItemSet& rItemSet = rCaptionObj.GetMergedItemSet();
-            const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
-                drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
+            const drawinglayer::attribute::SdrLineFillEffectsTextAttribute aAttribute(
+                drawinglayer::primitive2d::createNewSdrLineFillEffectsTextAttribute(
                     rItemSet,
                     rCaptionObj.getText(0),
                     false));
diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
index 898f7287987d..6379c960961f 100644
--- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
@@ -42,8 +42,8 @@ namespace sdr::contact
         drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrCircObj::createViewIndependentPrimitive2DSequence() const
         {
             const SfxItemSet& rItemSet = GetCircObj().GetMergedItemSet();
-            const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
-                drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
+            const drawinglayer::attribute::SdrLineFillEffectsTextAttribute aAttribute(
+                drawinglayer::primitive2d::createNewSdrLineFillEffectsTextAttribute(
                     rItemSet,
                     GetCircObj().getText(0),
                     false));
diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
index 22b506545eeb..e27bf663f0a8 100644
--- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx
@@ -44,8 +44,8 @@ namespace sdr::contact
 
             // ckeck attributes
             const SfxItemSet& rItemSet = GetEdgeObj().GetMergedItemSet();
-            const drawinglayer::attribute::SdrLineShadowTextAttribute aAttribute(
-                drawinglayer::primitive2d::createNewSdrLineShadowTextAttribute(
+            const drawinglayer::attribute::SdrLineEffectsTextAttribute aAttribute(
+                drawinglayer::primitive2d::createNewSdrLineEffectsTextAttribute(
                     rItemSet,
                     GetEdgeObj().getText(0)));
 
diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
index e89413b70910..4676a6b72768 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx
@@ -44,8 +44,8 @@ namespace sdr::contact
         drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrMeasureObj::createViewIndependentPrimitive2DSequence() const
         {
             const SfxItemSet& rItemSet = GetMeasureObj().GetMergedItemSet();
-            const drawinglayer::attribute::SdrLineShadowTextAttribute aAttribute(
-                drawinglayer::primitive2d::createNewSdrLineShadowTextAttribute(
+            const drawinglayer::attribute::SdrLineEffectsTextAttribute aAttribute(
+                drawinglayer::primitive2d::createNewSdrLineEffectsTextAttribute(
                     rItemSet,
                     GetMeasureObj().getText(0)));
 
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index bf1249be1c47..3ac982af73df 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -109,8 +109,8 @@ namespace sdr::contact
 
             // #i98072# Get shadow and text; eventually suppress the text if it's
             // a TextPath FontworkGallery object
-            const drawinglayer::attribute::SdrShadowTextAttribute aAttribute(
-                drawinglayer::primitive2d::createNewSdrShadowTextAttribute(
+            const drawinglayer::attribute::SdrEffectsTextAttribute aAttribute(
+                drawinglayer::primitive2d::createNewSdrEffectsTextAttribute(
                     rItemSet,
                     GetCustomShapeObj().getText(0),
                     GetCustomShapeObj().IsTextPath()));
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index fa6646bf07b1..57077e7b30eb 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -81,8 +81,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrOle2Obj::createP
     const SfxItemSet& rItemSet = GetOle2Obj().GetMergedItemSet();
 
     // this may be refined more granular; if no content, attributes may get simpler
-    const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
-        drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
+    const drawinglayer::attribute::SdrLineFillEffectsTextAttribute aAttribute(
+        drawinglayer::primitive2d::createNewSdrLineFillEffectsTextAttribute(
             rItemSet,
             GetOle2Obj().getText(0),
             true));
@@ -162,8 +162,8 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrOle2Obj::createP
 basegfx::B2DRange ViewContactOfSdrOle2Obj::getRange( const drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const
 {
     // this may be refined more granular; if no content, attributes may get simpler
-    const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute =
-        drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
+    const drawinglayer::attribute::SdrLineFillEffectsTextAttribute aAttribute =
+        drawinglayer::primitive2d::createNewSdrLineFillEffectsTextAttribute(
             GetOle2Obj().GetMergedItemSet(),
             GetOle2Obj().getText(0),
             true);
diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 3aefa6d48cb7..83fe88b6a637 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -68,8 +68,8 @@ namespace sdr::contact
         drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrPathObj::createViewIndependentPrimitive2DSequence() const
         {
             const SfxItemSet& rItemSet = GetPathObj().GetMergedItemSet();
-            const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
-                drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
+            const drawinglayer::attribute::SdrLineFillEffectsTextAttribute aAttribute(
+                drawinglayer::primitive2d::createNewSdrLineFillEffectsTextAttribute(
                     rItemSet,
                     GetPathObj().getText(0),
                     false));
diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
index 0133f0320725..5dfc826fb05f 100644
--- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
@@ -41,8 +41,8 @@ ViewContactOfSdrRectObj::~ViewContactOfSdrRectObj()
 drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrRectObj::createViewIndependentPrimitive2DSequence() const
 {
     const SfxItemSet& rItemSet = GetRectObj().GetMergedItemSet();
-    const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
-        drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
+    const drawinglayer::attribute::SdrLineFillEffectsTextAttribute aAttribute(
+        drawinglayer::primitive2d::createNewSdrLineFillEffectsTextAttribute(
             rItemSet,
             GetRectObj().getText(0),
             false));
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 0e8dec828bf6..5f036976d90a 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -71,10 +71,10 @@
 #include <editeng/editstat.hxx>
 #include <drawinglayer/attribute/fillhatchattribute.hxx>
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
-#include <sdr/attribute/sdrshadowtextattribute.hxx>
-#include <sdr/attribute/sdrlineshadowtextattribute.hxx>
+#include <sdr/attribute/sdreffectstextattribute.hxx>
+#include <sdr/attribute/sdrlineeffectstextattribute.hxx>
 #include <sdr/attribute/sdrformtextattribute.hxx>
-#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx>
+#include <sdr/attribute/sdrlinefilleffectstextattribute.hxx>
 #include <drawinglayer/attribute/sdrglowattribute.hxx>
 #include <drawinglayer/attribute/sdrsceneattribute3d.hxx>
 #include <drawinglayer/attribute/sdrlightingattribute3d.hxx>
@@ -731,7 +731,7 @@ namespace drawinglayer::primitive2d
                 rSet.Get(XATTR_FILLBMP_SIZELOG).GetValue());
         }
 
-        attribute::SdrShadowTextAttribute createNewSdrShadowTextAttribute(
+        attribute::SdrEffectsTextAttribute createNewSdrEffectsTextAttribute(
             const SfxItemSet& rSet,
             const SdrText* pText,
             bool bSuppressText)
@@ -749,10 +749,10 @@ namespace drawinglayer::primitive2d
             const attribute::SdrShadowAttribute aShadow(createNewSdrShadowAttribute(rSet));
             const attribute::SdrGlowAttribute aGlow(createNewSdrGlowAttribute(rSet));
 
-            return attribute::SdrShadowTextAttribute(aShadow, aText, aGlow);
+            return attribute::SdrEffectsTextAttribute(aShadow, aText, aGlow);
         }
 
-        attribute::SdrLineShadowTextAttribute createNewSdrLineShadowTextAttribute(
+        attribute::SdrLineEffectsTextAttribute createNewSdrLineEffectsTextAttribute(
             const SfxItemSet& rSet,
             const SdrText* pText)
         {
@@ -794,13 +794,13 @@ namespace drawinglayer::primitive2d
                 const attribute::SdrShadowAttribute aShadow(createNewSdrShadowAttribute(rSet));
                 attribute::SdrGlowAttribute aGlow = createNewSdrGlowAttribute(rSet);
 
-                return attribute::SdrLineShadowTextAttribute(aLine, aLineStartEnd, aShadow, aText, aGlow);
+                return attribute::SdrLineEffectsTextAttribute(aLine, aLineStartEnd, aShadow, aText, aGlow);
             }
 
-            return attribute::SdrLineShadowTextAttribute();
+            return attribute::SdrLineEffectsTextAttribute();
         }
 
-        attribute::SdrLineFillShadowTextAttribute createNewSdrLineFillShadowTextAttribute(
+        attribute::SdrLineFillEffectsTextAttribute createNewSdrLineFillEffectsTextAttribute(
             const SfxItemSet& rSet,
             const SdrText* pText,
             bool bHasContent)
@@ -858,11 +858,11 @@ namespace drawinglayer::primitive2d
                 // glow
                 attribute::SdrGlowAttribute aGlow = createNewSdrGlowAttribute(rSet);
 
-                return attribute::SdrLineFillShadowTextAttribute(
+                return attribute::SdrLineFillEffectsTextAttribute(
                     aLine, aFill, aLineStartEnd, aShadow, aFillFloatTransGradient, aText, aGlow);
             }
 
-            return attribute::SdrLineFillShadowTextAttribute();
+            return attribute::SdrLineFillEffectsTextAttribute();
         }
 
         attribute::SdrLineFillShadowAttribute3D createNewSdrLineFillShadowAttribute(const SfxItemSet& rSet, bool bSuppressFill)
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index 5648a090c97b..5abce7edef3a 100644
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
@@ -122,7 +122,7 @@ namespace drawinglayer::primitive2d
 
         SdrCaptionPrimitive2D::SdrCaptionPrimitive2D(
             const basegfx::B2DHomMatrix& rTransform,
-            const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
+            const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute,
             const basegfx::B2DPolygon& rTail,
             double fCornerRadiusX,
             double fCornerRadiusY)
diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
index dedee830185b..8b5c8413ccdf 100644
--- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx
@@ -76,7 +76,7 @@ namespace drawinglayer::primitive2d
         }
 
         SdrConnectorPrimitive2D::SdrConnectorPrimitive2D(
-            const attribute::SdrLineShadowTextAttribute& rSdrLSTAttribute,
+            const attribute::SdrLineEffectsTextAttribute& rSdrLSTAttribute,
             const ::basegfx::B2DPolygon& rUnitPolygon)
         :   BufferedDecompositionPrimitive2D(),
             maSdrLSTAttribute(rSdrLSTAttribute),
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 87f564e8dd6f..5de10ebe523a 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -83,7 +83,7 @@ namespace drawinglayer::primitive2d
         }
 
         SdrCustomShapePrimitive2D::SdrCustomShapePrimitive2D(
-            const attribute::SdrShadowTextAttribute& rSdrSTAttribute,
+            const attribute::SdrEffectsTextAttribute& rSdrSTAttribute,
             const Primitive2DContainer& rSubPrimitives,
             const basegfx::B2DHomMatrix& rTextBox,
             bool bWordWrap,
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index 47512154ca15..1a341b8ff3fc 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
@@ -110,7 +110,7 @@ namespace drawinglayer::primitive2d
 
         SdrEllipsePrimitive2D::SdrEllipsePrimitive2D(
             const basegfx::B2DHomMatrix& rTransform,
-            const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute)
+            const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute)
         :   BufferedDecompositionPrimitive2D(),
             maTransform(rTransform),
             maSdrLFSTAttribute(rSdrLFSTAttribute)
@@ -222,7 +222,7 @@ namespace drawinglayer::primitive2d
 
         SdrEllipseSegmentPrimitive2D::SdrEllipseSegmentPrimitive2D(
             const basegfx::B2DHomMatrix& rTransform,
-            const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
+            const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute,
             double fStartAngle,
             double fEndAngle,
             bool bCloseSegment,
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index a06d3967ae1a..f4b1848eb31e 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -131,7 +131,7 @@ namespace drawinglayer::primitive2d
 
         SdrGrafPrimitive2D::SdrGrafPrimitive2D(
             const basegfx::B2DHomMatrix& rTransform,
-            const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
+            const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute,
             const GraphicObject& rGraphicObject,
             const GraphicAttr& rGraphicAttr)
         :   BufferedDecompositionPrimitive2D(),
diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
index 30b0ad5f7df7..0b037e5fa74b 100644
--- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx
@@ -433,7 +433,7 @@ namespace drawinglayer::primitive2d
         }
 
         SdrMeasurePrimitive2D::SdrMeasurePrimitive2D(
-            const attribute::SdrLineShadowTextAttribute& rSdrLSTAttribute,
+            const attribute::SdrLineEffectsTextAttribute& rSdrLSTAttribute,
             const basegfx::B2DPoint& rStart,
             const basegfx::B2DPoint& rEnd,
             MeasureTextPosition eHorizontal,
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index 7d6b5bbb8ff2..0c4dafcd7930 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
@@ -34,7 +34,7 @@ namespace drawinglayer::primitive2d
         SdrOle2Primitive2D::SdrOle2Primitive2D(
             const Primitive2DContainer& rOLEContent,
             const basegfx::B2DHomMatrix& rTransform,
-            const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute)
+            const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute)
         :   BasePrimitive2D(),
             maOLEContent(rOLEContent),
             maTransform(rTransform),
diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
index 72c8e68abc1f..721eff0ce364 100644
--- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx
@@ -120,7 +120,7 @@ namespace drawinglayer::primitive2d
 
         SdrPathPrimitive2D::SdrPathPrimitive2D(
             const basegfx::B2DHomMatrix& rTransform,
-            const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
+            const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute,
             const basegfx::B2DPolyPolygon& rUnitPolyPolygon,
             const basegfx::B2DPolyPolygon& rUnitDefinitionPolyPolygon)
         :   BufferedDecompositionPrimitive2D(),
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index 117c7755b992..0d3387f2ff4f 100644
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
@@ -113,7 +113,7 @@ namespace drawinglayer::primitive2d
 
         SdrRectanglePrimitive2D::SdrRectanglePrimitive2D(
             const basegfx::B2DHomMatrix& rTransform,
-            const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute,
+            const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute,
             double fCornerRadiusX,
             double fCornerRadiusY,
             bool bForceFillForHitTest)