summaryrefslogtreecommitdiff
path: root/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx')
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 2193dd63af..b6044df2b0 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -45,7 +45,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrCustomShapePrimitive2D : public BasePrimitive2D
+ class SdrCustomShapePrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
attribute::SdrShadowTextAttribute maSdrSTAttribute;
@@ -57,16 +57,16 @@ namespace drawinglayer
// that the text needs to be block formatted
unsigned mbWordWrap : 1;
- // #SJ# Allow text clipping against TextBox in special cases (used for SC)
- unsigned mbForceTextClipToTextRange : 1;
-
// defines that the object contains/is a 3D AutoShape. Needed for
// making exceptions with shadow generation
unsigned mb3DShape : 1;
+ // #SJ# Allow text clipping against TextBox in special cases (used for SC)
+ unsigned mbForceTextClipToTextRange : 1;
+
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrCustomShapePrimitive2D(
@@ -74,16 +74,16 @@ namespace drawinglayer
const Primitive2DSequence& rSubPrimitives,
const basegfx::B2DHomMatrix& rTextBox,
bool bWordWrap,
- bool bForceTextClipToTextRange,
- bool b3DShape);
+ bool b3DShape,
+ bool bForceTextClipToTextRange);
// data access
const attribute::SdrShadowTextAttribute& getSdrSTAttribute() const { return maSdrSTAttribute; }
const Primitive2DSequence& getSubPrimitives() const { return maSubPrimitives; }
const basegfx::B2DHomMatrix& getTextBox() const { return maTextBox; }
bool getWordWrap() const { return mbWordWrap; }
+ bool get3DShape() const { return mb3DShape; }
bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; }
- bool get3DShape() const { return mb3DShape; }
// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const;