summaryrefslogtreecommitdiff
path: root/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx')
-rw-r--r--svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx40
1 files changed, 20 insertions, 20 deletions
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index db10e0833ff4..1cb5edf1ab6e 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -90,11 +90,11 @@ namespace drawinglayer
const OutlinerParaObject& getOutlinerParaObject() const { return maOutlinerParaObject; }
// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// own get2DDecomposition to take aspect of decomposition with or without spell checker
// into account
- virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
+ virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override;
// transformed clone operator
virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const = 0;
@@ -119,7 +119,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override;
public:
SdrContourTextPrimitive2D(
@@ -133,10 +133,10 @@ namespace drawinglayer
const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; }
// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
+ virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
DeclPrimitive2DIDBlock()
@@ -161,7 +161,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override;
public:
SdrPathTextPrimitive2D(
@@ -175,10 +175,10 @@ namespace drawinglayer
const attribute::SdrFormTextAttribute& getSdrFormTextAttribute() const { return maSdrFormTextAttribute; }
// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
+ virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
DeclPrimitive2DIDBlock()
@@ -211,7 +211,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override;
public:
SdrBlockTextPrimitive2D(
@@ -237,10 +237,10 @@ namespace drawinglayer
bool getClipOnBounds() const { return mbClipOnBounds; }
// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
+ virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
DeclPrimitive2DIDBlock()
@@ -265,7 +265,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override;
public:
SdrStretchTextPrimitive2D(
@@ -279,10 +279,10 @@ namespace drawinglayer
bool isFixedCellHeight() const { return mbFixedCellHeight; }
// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
+ virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
DeclPrimitive2DIDBlock()
@@ -306,7 +306,7 @@ namespace drawinglayer
protected:
// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override;
public:
SdrAutoFitTextPrimitive2D(
@@ -320,10 +320,10 @@ namespace drawinglayer
bool getWordWrap() const { return mbWordWrap; }
// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
+ virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
DeclPrimitive2DIDBlock()
@@ -343,7 +343,7 @@ namespace drawinglayer
::basegfx::B2DHomMatrix maTextRangeTransform; // text range transformation from unit range ([0.0 .. 1.0]) to text range
protected:
// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE;
+ virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override;
public:
SdrChainedTextPrimitive2D(
@@ -356,10 +356,10 @@ namespace drawinglayer
//bool getWordWrap() const { return true; } // XXX: Hack! Should have a proper implementation//
// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE;
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
// transformed clone operator
- virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE;
+ virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const override;
// provide unique ID
DeclPrimitive2DIDBlock()