diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /include/svx/svdotext.hxx | |
parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'include/svx/svdotext.hxx')
-rw-r--r-- | include/svx/svdotext.hxx | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 84393da7da29..d5f8e01c3353 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -108,7 +108,7 @@ public: ImpSdrObjTextLinkUserData(SdrTextObj* pObj1); virtual ~ImpSdrObjTextLinkUserData(); - virtual SdrObjUserData* Clone(SdrObject* pObj1) const; + virtual SdrObjUserData* Clone(SdrObject* pObj1) const SAL_OVERRIDE; }; namespace sdr @@ -137,8 +137,8 @@ private: friend class sdr::properties::CustomShapeProperties; protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; private: // This method is only allowed for sdr::properties::TextProperties @@ -286,9 +286,9 @@ protected: // rAnchorRect ist InOut-Parameter! void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const; - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; bool NbcSetEckenradius(long nRad); bool NbcSetAutoGrowHeight(bool bAuto); bool NbcSetMaxTextFrameHeight(long nHgt); @@ -345,7 +345,7 @@ public: SdrObjKind GetTextKind() const { return eTextKind; } // #i121917# - virtual bool HasText() const; + virtual bool HasText() const SAL_OVERRIDE; bool HasEditText() const; bool IsTextEditActive() const { return (pEdtOutl != 0L); } @@ -354,10 +354,10 @@ public: virtual SdrText* getActiveText() const; /** returns the nth available text. */ - virtual SdrText* getText( sal_Int32 nIndex ) const; + virtual SdrText* getText( sal_Int32 nIndex ) const SAL_OVERRIDE; /** returns the number of texts available for this object. */ - virtual sal_Int32 getTextCount() const; + virtual sal_Int32 getTextCount() const SAL_OVERRIDE; /** returns true only if we are in edit mode and the user actually changed anything */ virtual bool IsRealyEdited() const; @@ -422,69 +422,69 @@ public: SdrTextAniKind GetTextAniKind() const; SdrTextAniDirection GetTextAniDirection() const; - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pNewModel); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; // Wird zur Bestimmung des Textankerbereichs benoetigt virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; - virtual SdrTextObj* Clone() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; + virtual SdrTextObj* Clone() const SAL_OVERRIDE; SdrTextObj& operator=(const SdrTextObj& rObj); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual basegfx::B2DPolyPolygon TakeContour() const; - virtual void RecalcSnapRect(); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual const Rectangle& GetLogicRect() const; - virtual long GetRotateAngle() const; - virtual long GetShearAngle(bool bVertical = false) const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; + virtual long GetRotateAngle() const SAL_OVERRIDE; + virtual long GetShearAngle(bool bVertical = false) const SAL_OVERRIDE; - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - virtual Pointer GetCreatePointer() const; - - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - - virtual bool HasTextEdit() const; - virtual bool BegTextEdit(SdrOutliner& rOutl); + virtual bool hasSpecialDrag() 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 nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + + virtual bool HasTextEdit() const SAL_OVERRIDE; + virtual bool BegTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual void EndTextEdit(SdrOutliner& rOutl); + virtual void EndTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; virtual sal_uInt16 GetOutlinerViewAnchorMode() const; - virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); + virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SAL_OVERRIDE; void NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObject, SdrText* pText ); - virtual OutlinerParaObject* GetOutlinerParaObject() const; + virtual OutlinerParaObject* GetOutlinerParaObject() const SAL_OVERRIDE; virtual OutlinerParaObject* GetEditOutlinerParaObject() const; - virtual void NbcReformatText(); - virtual void ReformatText(); + virtual void NbcReformatText() SAL_OVERRIDE; + virtual void ReformatText() SAL_OVERRIDE; virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } @@ -536,12 +536,12 @@ public: // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE; // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has // to use (0,0) as upper left and will be scaled to the given size in the matrix. - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); + virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE; // #103836# iterates over the paragraphs of a given SdrObject and removes all // hard set character attributes with the which ids contained in the |