summaryrefslogtreecommitdiff
path: root/svx/inc/svx/sdr/primitive2d
diff options
context:
space:
mode:
Diffstat (limited to 'svx/inc/svx/sdr/primitive2d')
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx16
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx6
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx21
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx4
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx10
11 files changed, 41 insertions, 40 deletions
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index 01bb7794e9f3..177c42bfff17 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrCaptionPrimitive2D : public BasePrimitive2D
+ class SdrCaptionPrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
::basegfx::B2DHomMatrix maTransform;
@@ -57,7 +57,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrCaptionPrimitive2D(
diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index ba7cc7fed9c8..5523480f1f51 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
@@ -45,7 +45,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrConnectorPrimitive2D : public BasePrimitive2D
+ class SdrConnectorPrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
attribute::SdrLineShadowTextAttribute maSdrLSTAttribute;
@@ -53,7 +53,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrConnectorPrimitive2D(
diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index 8f7f0eb23cb3..72035eb99569 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;
diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 1ef6d0864a3a..1d11c27ede71 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -45,7 +45,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrEllipsePrimitive2D : public BasePrimitive2D
+ class SdrEllipsePrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
::basegfx::B2DHomMatrix maTransform;
@@ -53,7 +53,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrEllipsePrimitive2D(
@@ -91,7 +91,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrEllipseSegmentPrimitive2D(
diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
index df2114437015..787c230d7b3d 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -47,7 +47,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrGrafPrimitive2D : public BasePrimitive2D
+ class SdrGrafPrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
::basegfx::B2DHomMatrix maTransform;
@@ -57,7 +57,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrGrafPrimitive2D(
diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index a7084993b5f2..3e998f23fd2b 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -59,7 +59,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrMeasurePrimitive2D : public BasePrimitive2D
+ class SdrMeasurePrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
attribute::SdrLineShadowTextAttribute maSdrLSTAttribute;
@@ -89,7 +89,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrMeasurePrimitive2D(
diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
index 7c7081720034..2deaf474e12e 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx
@@ -32,7 +32,7 @@
#ifndef INCLUDED_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
#define INCLUDED_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <drawinglayer/attribute/sdrattribute.hxx>
#include <svx/sdr/attribute/sdrallattribute.hxx>
@@ -46,29 +46,30 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrOle2Primitive2D : public GroupPrimitive2D
+ class SdrOle2Primitive2D : public BasePrimitive2D
{
private:
- ::basegfx::B2DHomMatrix maTransform;
+ Primitive2DSequence maOLEContent;
+ basegfx::B2DHomMatrix maTransform;
attribute::SdrLineFillShadowTextAttribute maSdrLFSTAttribute;
- protected:
- // local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
-
public:
SdrOle2Primitive2D(
- const Primitive2DSequence& rChildren,
- const ::basegfx::B2DHomMatrix& rTransform,
+ const Primitive2DSequence& rOLEContent,
+ const basegfx::B2DHomMatrix& rTransform,
const attribute::SdrLineFillShadowTextAttribute& rSdrLFSTAttribute);
// data access
- const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
+ const Primitive2DSequence& getOLEContent() const { return maOLEContent; }
+ const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; }
// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
+ // local decomposition.
+ virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+
// provide unique ID
DeclPrimitrive2DIDBlock()
};
diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 9ee4f3f69417..ff04a6a5e79b 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -47,7 +47,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrOleContentPrimitive2D : public BasePrimitive2D
+ class SdrOleContentPrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
SdrObjectWeakRef mpSdrOle2Obj;
@@ -63,7 +63,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrOleContentPrimitive2D(
diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
index 97b12b72d4a5..d6de666d901f 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrPathPrimitive2D : public BasePrimitive2D
+ class SdrPathPrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
basegfx::B2DHomMatrix maTransform;
@@ -55,7 +55,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrPathPrimitive2D(
diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 23bbc2676f22..816956b188fe 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrRectanglePrimitive2D : public BasePrimitive2D
+ class SdrRectanglePrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
basegfx::B2DHomMatrix maTransform;
@@ -60,7 +60,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrRectanglePrimitive2D(
diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index 059849531566..ec35ff75f36d 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -52,7 +52,7 @@ namespace drawinglayer
{
namespace primitive2d
{
- class SdrTextPrimitive2D : public BasePrimitive2D
+ class SdrTextPrimitive2D : public BufferedDecompositionPrimitive2D
{
private:
// The text model data; this sould later just be the OutlinerParaObject or
@@ -131,7 +131,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrContourTextPrimitive2D(
@@ -173,7 +173,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrPathTextPrimitive2D(
@@ -223,7 +223,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrBlockTextPrimitive2D(
@@ -277,7 +277,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const;
public:
SdrStretchTextPrimitive2D(
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 22:23:01 +0000