diff options
38 files changed, 152 insertions, 152 deletions
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index d11bb2aae9b4..aa7308cae883 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -13211,9 +13211,9 @@ svx/inc/sdgtritm.hxx svx/inc/sdr/attribute/sdrfilltextattribute.hxx svx/inc/sdr/attribute/sdrformtextattribute.hxx svx/inc/sdr/attribute/sdrformtextoutlineattribute.hxx -svx/inc/sdr/attribute/sdrlinefillshadowtextattribute.hxx -svx/inc/sdr/attribute/sdrlineshadowtextattribute.hxx -svx/inc/sdr/attribute/sdrshadowtextattribute.hxx +svx/inc/sdr/attribute/sdrlinefilleffectstextattribute.hxx +svx/inc/sdr/attribute/sdrlineeffectstextattribute.hxx +svx/inc/sdr/attribute/sdreffectstextattribute.hxx svx/inc/sdr/attribute/sdrtextattribute.hxx svx/inc/sdr/contact/objectcontactofobjlistpainter.hxx svx/inc/sdr/contact/viewcontactofe3d.hxx @@ -13601,9 +13601,9 @@ svx/source/sdr/attribute/sdrallfillattributeshelper.cxx svx/source/sdr/attribute/sdrfilltextattribute.cxx svx/source/sdr/attribute/sdrformtextattribute.cxx svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx -svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx -svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx -svx/source/sdr/attribute/sdrshadowtextattribute.cxx +svx/source/sdr/attribute/sdrlinefilleffectstextattribute.cxx +svx/source/sdr/attribute/sdrlineeffectstextattribute.cxx +svx/source/sdr/attribute/sdreffectstextattribute.cxx svx/source/sdr/attribute/sdrtextattribute.cxx svx/source/sdr/contact/displayinfo.cxx svx/source/sdr/contact/objectcontact.cxx diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 222d69bb6c8a..f18e60d54d5d 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -163,11 +163,11 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/sdr/animation/objectanimator \ svx/source/sdr/animation/animationstate \ svx/source/sdr/attribute/sdrallfillattributeshelper \ - svx/source/sdr/attribute/sdrlinefillshadowtextattribute \ + svx/source/sdr/attribute/sdrlinefilleffectstextattribute \ svx/source/sdr/attribute/sdrfilltextattribute \ - svx/source/sdr/attribute/sdrshadowtextattribute \ + svx/source/sdr/attribute/sdreffectstextattribute \ svx/source/sdr/attribute/sdrtextattribute \ - svx/source/sdr/attribute/sdrlineshadowtextattribute \ + svx/source/sdr/attribute/sdrlineeffectstextattribute \ svx/source/sdr/attribute/sdrformtextattribute \ svx/source/sdr/attribute/sdrformtextoutlineattribute \ svx/source/sdr/contact/viewobjectcontactofgroup \ diff --git a/svx/inc/sdr/attribute/sdrshadowtextattribute.hxx b/svx/inc/sdr/attribute/sdreffectstextattribute.hxx index bbcd7e95a501..1c02eda63dd2 100644 --- a/svx/inc/sdr/attribute/sdrshadowtextattribute.hxx +++ b/svx/inc/sdr/attribute/sdreffectstextattribute.hxx @@ -28,7 +28,7 @@ namespace drawinglayer { namespace attribute { - class SdrShadowTextAttribute + class SdrEffectsTextAttribute { // shadow and text attributes SdrShadowAttribute maShadow; // shadow attributes (if used) @@ -38,19 +38,19 @@ namespace drawinglayer SdrGlowAttribute maGlow; public: - SdrShadowTextAttribute( + SdrEffectsTextAttribute( const SdrShadowAttribute& rShadow, const SdrTextAttribute& rTextAttribute, const SdrGlowAttribute& rGlow); - SdrShadowTextAttribute(); - SdrShadowTextAttribute(const SdrShadowTextAttribute& rCandidate); - SdrShadowTextAttribute& operator=(const SdrShadowTextAttribute& rCandidate); + SdrEffectsTextAttribute(); + SdrEffectsTextAttribute(const SdrEffectsTextAttribute& rCandidate); + SdrEffectsTextAttribute& operator=(const SdrEffectsTextAttribute& rCandidate); // checks if the incarnation is default constructed bool isDefault() const; // compare operator - bool operator==(const SdrShadowTextAttribute& rCandidate) const; + bool operator==(const SdrEffectsTextAttribute& rCandidate) const; // data access const SdrShadowAttribute& getShadow() const { return maShadow; } diff --git a/svx/inc/sdr/attribute/sdrlineshadowtextattribute.hxx b/svx/inc/sdr/attribute/sdrlineeffectstextattribute.hxx index 840b20e44cc9..ce9e0223c201 100644 --- a/svx/inc/sdr/attribute/sdrlineshadowtextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrlineeffectstextattribute.hxx @@ -19,7 +19,7 @@ #pragma once -#include <sdr/attribute/sdrshadowtextattribute.hxx> +#include <sdr/attribute/sdreffectstextattribute.hxx> #include <drawinglayer/attribute/sdrglowattribute.hxx> #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrlinestartendattribute.hxx> @@ -29,28 +29,28 @@ namespace drawinglayer { namespace attribute { - class SdrLineShadowTextAttribute : public SdrShadowTextAttribute + class SdrLineEffectsTextAttribute : public SdrEffectsTextAttribute { // line, shadow, lineStartEnd and text attributes SdrLineAttribute maLine; // line attributes (if used) SdrLineStartEndAttribute maLineStartEnd; // line start end (if used) public: - SdrLineShadowTextAttribute( + SdrLineEffectsTextAttribute( const SdrLineAttribute& rLine, const SdrLineStartEndAttribute& rLineStartEnd, const SdrShadowAttribute& rShadow, const SdrTextAttribute& rTextAttribute, const SdrGlowAttribute& rGlow); - SdrLineShadowTextAttribute(); - SdrLineShadowTextAttribute(const SdrLineShadowTextAttribute& rCandidate); - SdrLineShadowTextAttribute& operator=(const SdrLineShadowTextAttribute& rCandidate); + SdrLineEffectsTextAttribute(); + SdrLineEffectsTextAttribute(const SdrLineEffectsTextAttribute& rCandidate); + SdrLineEffectsTextAttribute& operator=(const SdrLineEffectsTextAttribute& rCandidate); // checks if the incarnation is default constructed bool isDefault() const; // compare operator - bool operator==(const SdrLineShadowTextAttribute& rCandidate) const; + bool operator==(const SdrLineEffectsTextAttribute& rCandidate) const; // data access const SdrLineAttribute& getLine() const { return maLine; } diff --git a/svx/inc/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/svx/inc/sdr/attribute/sdrlinefilleffectstextattribute.hxx index f9d7969e519a..d590378bf4c5 100644 --- a/svx/inc/sdr/attribute/sdrlinefillshadowtextattribute.hxx +++ b/svx/inc/sdr/attribute/sdrlinefilleffectstextattribute.hxx @@ -19,7 +19,7 @@ #pragma once -#include <sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineeffectstextattribute.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> @@ -28,14 +28,14 @@ namespace drawinglayer { namespace attribute { - class SdrLineFillShadowTextAttribute : public SdrLineShadowTextAttribute + class SdrLineFillEffectsTextAttribute : public SdrLineEffectsTextAttribute { // add fill and transGradient attributes SdrFillAttribute maFill; // fill attributes (if used) FillGradientAttribute maFillFloatTransGradient; // fill float transparence gradient (if used) public: - SdrLineFillShadowTextAttribute( + SdrLineFillEffectsTextAttribute( const SdrLineAttribute& rLine, const SdrFillAttribute& rFill, const SdrLineStartEndAttribute& rLineStartEnd, @@ -43,15 +43,15 @@ namespace drawinglayer const FillGradientAttribute& rFillFloatTransGradient, const SdrTextAttribute& rTextAttribute, const SdrGlowAttribute& rGlow); - SdrLineFillShadowTextAttribute(); - SdrLineFillShadowTextAttribute(const SdrLineFillShadowTextAttribute& rCandidate); - SdrLineFillShadowTextAttribute& operator=(const SdrLineFillShadowTextAttribute& rCandidate); + SdrLineFillEffectsTextAttribute(); + SdrLineFillEffectsTextAttribute(const SdrLineFillEffectsTextAttribute& rCandidate); + SdrLineFillEffectsTextAttribute& operator=(const SdrLineFillEffectsTextAttribute& rCandidate); // checks if the incarnation is default constructed bool isDefault() const; // compare operator - bool operator==(const SdrLineFillShadowTextAttribute& rCandidate) const; + bool operator==(const SdrLineFillEffectsTextAttribute& rCandidate) const; // data access const SdrFillAttribute& getFill() const { return maFill; } diff --git a/svx/inc/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/sdr/contact/viewcontactofgraphic.hxx index fa7447cec7f6..fa2138adb03f 100644 --- a/svx/inc/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/sdr/contact/viewcontactofgraphic.hxx @@ -23,7 +23,7 @@ #include <sdr/contact/viewcontactoftextobj.hxx> #include <svx/svdograf.hxx> -namespace drawinglayer::attribute { class SdrLineFillShadowTextAttribute; } +namespace drawinglayer::attribute { class SdrLineFillEffectsTextAttribute; } class GraphicAttr; namespace sdr @@ -36,10 +36,10 @@ namespace sdr // helpers for constructing various primitive visualisations in various states drawinglayer::primitive2d::Primitive2DContainer createVIP2DSForPresObj( const basegfx::B2DHomMatrix& rObjectMatrix, - const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const; + const drawinglayer::attribute::SdrLineFillEffectsTextAttribute& rAttribute) const; drawinglayer::primitive2d::Primitive2DContainer createVIP2DSForDraft( const basegfx::B2DHomMatrix& rObjectMatrix, - const drawinglayer::attribute::SdrLineFillShadowTextAttribute& rAttribute) const; + const drawinglayer::attribute::SdrLineFillEffectsTextAttribute& rAttribute) const; // Create an Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. diff --git a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx index 9cff4afd6770..1bcc8e22931e 100644 --- a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx +++ b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx @@ -36,9 +36,9 @@ namespace drawinglayer::attribute { class SdrTextAttribute; class FillGradientAttribute; class SdrFillGraphicAttribute; - class SdrShadowTextAttribute; - class SdrLineShadowTextAttribute; - class SdrLineFillShadowTextAttribute; + class SdrEffectsTextAttribute; + class SdrLineEffectsTextAttribute; + class SdrLineFillEffectsTextAttribute; class SdrLineFillShadowAttribute3D; class SdrSceneAttribute; class SdrLightingAttribute; @@ -83,16 +83,16 @@ namespace drawinglayer attribute::SdrFillGraphicAttribute createNewSdrFillGraphicAttribute( const SfxItemSet& rSet); - attribute::SdrShadowTextAttribute createNewSdrShadowTextAttribute( + attribute::SdrEffectsTextAttribute createNewSdrEffectsTextAttribute( const SfxItemSet& rSet, const SdrText* pText, bool bSuppressText); // #i98072# added option to suppress text on demand - attribute::SdrLineShadowTextAttribute createNewSdrLineShadowTextAttribute( + attribute::SdrLineEffectsTextAttribute createNewSdrLineEffectsTextAttribute( const SfxItemSet& rSet, const SdrText* pText); - attribute::SdrLineFillShadowTextAttribute createNewSdrLineFillShadowTextAttribute( + attribute::SdrLineFillEffectsTextAttribute createNewSdrLineFillEffectsTextAttribute( const SfxItemSet& rSet, const SdrText* pText, bool bHasContent); // used from OLE and graphic diff --git a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx index ec6cd2320e41..4ed7d7f1ff74 100644 --- a/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefilleffectstextattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -37,7 +37,7 @@ namespace drawinglayer { private: ::basegfx::B2DHomMatrix maTransform; - attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute; + attribute::SdrLineFillEffectsTextAttribute maSdrLFSTAttribute; ::basegfx::B2DPolygon maTail; double mfCornerRadiusX; // [0.0..1.0] relative to 1/2 width double mfCornerRadiusY; // [0.0..1.0] relative to 1/2 height @@ -48,7 +48,7 @@ namespace drawinglayer public: SdrCaptionPrimitive2D( const ::basegfx::B2DHomMatrix& rTransform, - const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute, + const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, const ::basegfx::B2DPolygon& rTail, double fCornerRadiusX, double fCornerRadiusY); @@ -58,7 +58,7 @@ namespace drawinglayer // data access const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; } - const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } + const attribute::SdrLineFillEffectsTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } const ::basegfx::B2DPolygon& getTail() const { return maTail; } double getCornerRadiusX() const { return mfCornerRadiusX; } double getCornerRadiusY() const { return mfCornerRadiusY; } diff --git a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx index f115283dc786..8a2d75ae1eb0 100644 --- a/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineeffectstextattribute.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -35,7 +35,7 @@ namespace drawinglayer class SdrConnectorPrimitive2D final : public BufferedDecompositionPrimitive2D { private: - attribute::SdrLineShadowTextAttribute maSdrLSTAttribute; + attribute::SdrLineEffectsTextAttribute maSdrLSTAttribute; ::basegfx::B2DPolygon maUnitPolygon; // local decomposition. @@ -43,11 +43,11 @@ namespace drawinglayer public: SdrConnectorPrimitive2D( - const attribute::SdrLineShadowTextAttribute& rSdrLSTAttribute, + const attribute::SdrLineEffectsTextAttribute& rSdrLSTAttribute, const ::basegfx::B2DPolygon& rUnitPolygon); // data access - const attribute::SdrLineShadowTextAttribute& getSdrLSTAttribute() const { return maSdrLSTAttribute; } + const attribute::SdrLineEffectsTextAttribute& getSdrLSTAttribute() const { return maSdrLSTAttribute; } const ::basegfx::B2DPolygon& getUnitPolygon() const { return maUnitPolygon; } // compare operator diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index aaa93af94595..063f6ec92c29 100644 --- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdr/attribute/sdrshadowtextattribute.hxx> +#include <sdr/attribute/sdreffectstextattribute.hxx> // predefines @@ -35,7 +35,7 @@ namespace drawinglayer class SdrCustomShapePrimitive2D : public BufferedDecompositionPrimitive2D { private: - attribute::SdrShadowTextAttribute maSdrSTAttribute; + attribute::SdrEffectsTextAttribute maSdrSTAttribute; Primitive2DContainer maSubPrimitives; basegfx::B2DHomMatrix maTextBox; @@ -55,7 +55,7 @@ namespace drawinglayer public: SdrCustomShapePrimitive2D( - const attribute::SdrShadowTextAttribute& rSdrSTAttribute, + const attribute::SdrEffectsTextAttribute& rSdrSTAttribute, const Primitive2DContainer& rSubPrimitives, const basegfx::B2DHomMatrix& rTextBox, bool bWordWrap, @@ -63,7 +63,7 @@ namespace drawinglayer const basegfx::B2DHomMatrix& rObjectMatrix); // data access - const attribute::SdrShadowTextAttribute& getSdrSTAttribute() const { return maSdrSTAttribute; } + const attribute::SdrEffectsTextAttribute& getSdrSTAttribute() const { return maSdrSTAttribute; } const Primitive2DContainer& getSubPrimitives() const { return maSubPrimitives; } const basegfx::B2DHomMatrix& getTextBox() const { return maTextBox; } bool getWordWrap() const { return mbWordWrap; } diff --git a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx index 9a498fdada90..2e2c0e20a170 100644 --- a/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefilleffectstextattribute.hxx> // predefines @@ -36,7 +36,7 @@ namespace drawinglayer { private: ::basegfx::B2DHomMatrix maTransform; - attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute; + attribute::SdrLineFillEffectsTextAttribute maSdrLFSTAttribute; // local decomposition. virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& aViewInformation) const override; @@ -44,11 +44,11 @@ namespace drawinglayer public: SdrEllipsePrimitive2D( const ::basegfx::B2DHomMatrix& rTransform, - const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute); + const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute); // data access const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; } - const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } + const attribute::SdrLineFillEffectsTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } // compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; @@ -79,7 +79,7 @@ namespace drawinglayer public: SdrEllipseSegmentPrimitive2D( const ::basegfx::B2DHomMatrix& rTransform, - const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute, + const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, double fStartAngle, double fEndAngle, bool bCloseSegment, diff --git a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx index e4e685bfa4d3..31b5f444f34f 100644 --- a/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -23,7 +23,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/GraphicObject.hxx> -#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefilleffectstextattribute.hxx> // predefines @@ -37,7 +37,7 @@ namespace drawinglayer { private: ::basegfx::B2DHomMatrix maTransform; - attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute; + attribute::SdrLineFillEffectsTextAttribute maSdrLFSTAttribute; GraphicObject maGraphicObject; GraphicAttr maGraphicAttr; @@ -47,13 +47,13 @@ namespace drawinglayer public: SdrGrafPrimitive2D( const ::basegfx::B2DHomMatrix& rTransform, - const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute, + const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, const GraphicObject& rGraphicObject, const GraphicAttr& rGraphicAttr); // data access const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; } - const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } + const attribute::SdrLineFillEffectsTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } const GraphicObject& getGraphicObject() const { return maGraphicObject; } const GraphicAttr& getGraphicAttr() const { return maGraphicAttr; } bool isTransparent() const; diff --git a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 34145b00eb17..4e28aad88e86 100644 --- a/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_INC_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <sdr/attribute/sdrlineshadowtextattribute.hxx> +#include <sdr/attribute/sdrlineeffectstextattribute.hxx> // predefines @@ -48,7 +48,7 @@ namespace drawinglayer class SdrMeasurePrimitive2D final : public BufferedDecompositionPrimitive2D { private: - attribute::SdrLineShadowTextAttribute maSdrLSTAttribute; + attribute::SdrLineEffectsTextAttribute maSdrLSTAttribute; basegfx::B2DPoint maStart; basegfx::B2DPoint maEnd; MeasureTextPosition meHorizontal; @@ -77,7 +77,7 @@ namespace drawinglayer public: SdrMeasurePrimitive2D( - const attribute::SdrLineShadowTextAttribute& rSdrLSTAttribute, + const attribute::SdrLineEffectsTextAttribute& rSdrLSTAttribute, const basegfx::B2DPoint& rStart, const basegfx::B2DPoint& rEnd, MeasureTextPosition eHorizontal, @@ -92,7 +92,7 @@ namespace drawinglayer bool bTextAutoAngle); // data access - const attribute::SdrLineShadowTextAttribute& getSdrLSTAttribute() const { return maSdrLSTAttribute; } + const attribute::SdrLineEffectsTextAttribute& getSdrLSTAttribute() const { return maSdrLSTAttribute; } const basegfx::B2DPoint& getStart() const { return maStart; } const basegfx::B2DPoint& getEnd() const { return maEnd; } MeasureTextPosition getHorizontal() const { return meHorizontal; } diff --git a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx index fe2d7ff7a9b3..8b3ce0bfb579 100644 --- a/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefilleffectstextattribute.hxx> // predefines @@ -37,18 +37,18 @@ namespace drawinglayer private: Primitive2DContainer maOLEContent; basegfx::B2DHomMatrix maTransform; - attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute; + attribute::SdrLineFillEffectsTextAttribute maSdrLFSTAttribute; public: SdrOle2Primitive2D( const Primitive2DContainer& rOLEContent, const basegfx::B2DHomMatrix& rTransform, - const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute); + const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute); // data access const Primitive2DContainer& getOLEContent() const { return maOLEContent; } const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } - const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } + const attribute::SdrLineFillEffectsTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } // compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; diff --git a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx index b6944230f18c..fe823eb7aa5d 100644 --- a/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefilleffectstextattribute.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -37,7 +37,7 @@ namespace drawinglayer { private: basegfx::B2DHomMatrix maTransform; - attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute; + attribute::SdrLineFillEffectsTextAttribute maSdrLFSTAttribute; basegfx::B2DPolyPolygon maUnitPolyPolygon; // OperationSmiley: Added to be able to define a FillGeometry different from local @@ -60,13 +60,13 @@ namespace drawinglayer // maUnitDefinitionPolyPolygon or set equal to UnitPolyPolygon SdrPathPrimitive2D( const basegfx::B2DHomMatrix& rTransform, - const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute, + const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, const basegfx::B2DPolyPolygon& rUnitPolyPolygon, const basegfx::B2DPolyPolygon& rUnitDefinitionPolyPolygon); // data access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } - const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } + const attribute::SdrLineFillEffectsTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } const basegfx::B2DPolyPolygon& getUnitPolyPolygon() const { return maUnitPolyPolygon; } const basegfx::B2DPolyPolygon& getUnitDefinitionPolyPolygon() const { return maUnitDefinitionPolyPolygon; } diff --git a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx index e0b561bb7dc1..d9c4119966ff 100644 --- a/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -22,7 +22,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdr/attribute/sdrlinefillshadowtextattribute.hxx> +#include <sdr/attribute/sdrlinefilleffectstextattribute.hxx> // predefines @@ -36,7 +36,7 @@ namespace drawinglayer { private: basegfx::B2DHomMatrix maTransform; - attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute; + attribute::SdrLineFillEffectsTextAttribute maSdrLFSTAttribute; double mfCornerRadiusX; // [0.0..1.0] relative to 1/2 width double mfCornerRadiusY; // [0.0..1.0] relative to 1/2 height @@ -49,14 +49,14 @@ namespace drawinglayer public: SdrRectanglePrimitive2D( const basegfx::B2DHomMatrix& rTransform, - const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute, + const attribute::SdrLineFillEffectsTextAttribute& rSdrLFSTAttribute, double fCornerRadiusX, double fCornerRadiusY, bool bForceFillForHitTest); // data access const basegfx::B2DHomMatrix& getTransform() const { return maTransform; } - const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } + const attribute::SdrLineFillEffectsTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } double getCornerRadiusX() const { return mfCornerRadiusX; } double getCornerRadiusY() const { return mfCornerRadiusY; } bool getForceFillForHitTest() const { return mbForceFillForHitTest; } 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) |