summaryrefslogtreecommitdiff
path: root/include/svx/svdomeas.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/svx/svdomeas.hxx')
-rw-r--r--include/svx/svdomeas.hxx112
1 files changed, 56 insertions, 56 deletions
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 81516e84a79a..146ee871c226 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -64,8 +64,8 @@ private:
friend class SdrMeasureField;
protected:
- virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE;
- virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE;
+ virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
+ virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override;
Point aPt1;
Point aPt2;
@@ -80,9 +80,9 @@ protected:
void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } }
void UndirtyText() const;
- virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE;
- virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE;
- virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE;
+ virtual SdrObjGeoData* NewGeoData() const override;
+ virtual void SaveGeoData(SdrObjGeoData& rGeo) const override;
+ virtual void RestGeoData(const SdrObjGeoData& rGeo) override;
public:
TYPEINFO_OVERRIDE();
@@ -90,66 +90,66 @@ public:
SdrMeasureObj(const Point& rPt1, const Point& rPt2);
virtual ~SdrMeasureObj();
- virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE;
- virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE;
- virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const SAL_OVERRIDE;
- virtual SdrMeasureObj* Clone() const SAL_OVERRIDE;
+ virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const override;
+ virtual sal_uInt16 GetObjIdentifier() const override;
+ virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const override;
+ virtual SdrMeasureObj* Clone() const override;
- virtual OUString TakeObjNameSingul() const SAL_OVERRIDE;
- virtual OUString TakeObjNamePlural() const SAL_OVERRIDE;
+ virtual OUString TakeObjNameSingul() const override;
+ virtual OUString TakeObjNamePlural() const override;
- virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE;
- virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE;
- virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE;
+ virtual basegfx::B2DPolyPolygon TakeXorPoly() const override;
+ virtual sal_uInt32 GetHdlCount() const override;
+ virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const override;
// special drag methods
- virtual bool hasSpecialDrag() const SAL_OVERRIDE;
- virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE;
- virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE;
- virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE;
-
- virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE;
- virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE;
- virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
- virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE;
- virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE;
- virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE;
- virtual Pointer GetCreatePointer() const SAL_OVERRIDE;
-
- virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
- virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE;
- virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) SAL_OVERRIDE;
- virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
- virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE;
- virtual long GetRotateAngle() const SAL_OVERRIDE;
- virtual void RecalcSnapRect() SAL_OVERRIDE;
-
- virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE;
- virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE;
-
- virtual bool IsPolyObj() const SAL_OVERRIDE;
- virtual sal_uInt32 GetPointCount() const SAL_OVERRIDE;
- virtual Point GetPoint(sal_uInt32 i) const SAL_OVERRIDE;
- virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) SAL_OVERRIDE;
-
- virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE;
-
- virtual bool BegTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE;
- virtual const Size& GetTextSize() const SAL_OVERRIDE;
+ virtual bool hasSpecialDrag() const override;
+ virtual bool beginSpecialDrag(SdrDragStat& rDrag) const override;
+ virtual bool applySpecialDrag(SdrDragStat& rDrag) override;
+ virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const override;
+
+ virtual bool BegCreate(SdrDragStat& rStat) override;
+ virtual bool MovCreate(SdrDragStat& rStat) override;
+ virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
+ virtual bool BckCreate(SdrDragStat& rStat) override;
+ virtual void BrkCreate(SdrDragStat& rStat) override;
+ virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const override;
+ virtual Pointer GetCreatePointer() const override;
+
+ virtual void NbcMove(const Size& rSiz) override;
+ virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override;
+ virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs) override;
+ virtual void NbcMirror(const Point& rRef1, const Point& rRef2) override;
+ virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool bVShear) override;
+ virtual long GetRotateAngle() const override;
+ virtual void RecalcSnapRect() override;
+
+ virtual sal_uInt32 GetSnapPointCount() const override;
+ virtual Point GetSnapPoint(sal_uInt32 i) const override;
+
+ virtual bool IsPolyObj() const override;
+ virtual sal_uInt32 GetPointCount() const override;
+ virtual Point GetPoint(sal_uInt32 i) const override;
+ virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override;
+
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const override;
+
+ virtual bool BegTextEdit(SdrOutliner& rOutl) override;
+ virtual const Size& GetTextSize() const override;
virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
- Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const SAL_OVERRIDE;
- virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const SAL_OVERRIDE;
- virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const SAL_OVERRIDE;
- virtual sal_uInt16 GetOutlinerViewAnchorMode() const SAL_OVERRIDE;
- virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SAL_OVERRIDE;
- virtual OutlinerParaObject* GetOutlinerParaObject() const SAL_OVERRIDE;
+ Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const override;
+ virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const override;
+ virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const override;
+ virtual sal_uInt16 GetOutlinerViewAnchorMode() const override;
+ virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override;
+ virtual OutlinerParaObject* GetOutlinerParaObject() const override;
virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos,
- bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const SAL_OVERRIDE;
+ bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const override;
// #i97878#
- virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE;
- virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE;
+ virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const override;
+ virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) override;
};
// Creating: