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/svdogrp.hxx | |
parent | Introduce INetContentType::scan (diff) | |
download | core-567ef6d5782cdb729b49005caf6005610ce03e22.tar.gz core-567ef6d5782cdb729b49005caf6005610ce03e22.zip |
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/svdogrp.hxx')
-rw-r--r-- | include/svx/svdogrp.hxx | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 5851b6280688..4a89e8f3a61d 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -39,8 +39,8 @@ class SVX_DLLPUBLIC SdrObjGroup : public SdrObject { private: protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; SdrObjList* pSub; // Subliste (Kinder) Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe @@ -51,63 +51,63 @@ public: SdrObjGroup(); virtual ~SdrObjGroup(); - virtual void SetBoundRectDirty(); - virtual sal_uInt16 GetObjIdentifier() const; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual SdrLayerID GetLayer() const; - virtual void NbcSetLayer(SdrLayerID nLayer); - virtual void SetObjList(SdrObjList* pNewObjList); - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pNewModel); - virtual bool HasRefPoint() const; - virtual Point GetRefPoint() const; - virtual void SetRefPoint(const Point& rPnt); - virtual SdrObjList* GetSubList() const; - - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetSnapRect() const; - - virtual SdrObjGroup* Clone() const; + virtual void SetBoundRectDirty() SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual SdrLayerID GetLayer() const SAL_OVERRIDE; + virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE; + virtual void SetObjList(SdrObjList* pNewObjList) SAL_OVERRIDE; + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual bool HasRefPoint() const SAL_OVERRIDE; + virtual Point GetRefPoint() const SAL_OVERRIDE; + virtual void SetRefPoint(const Point& rPnt) SAL_OVERRIDE; + virtual SdrObjList* GetSubList() const SAL_OVERRIDE; + + virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + + virtual SdrObjGroup* Clone() const SAL_OVERRIDE; SdrObjGroup& operator=(const SdrObjGroup& rObj); - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual void RecalcSnapRect(); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; // special drag methods - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - - virtual long GetRotateAngle() const; - virtual long GetShearAngle(bool bVertical = false) const; - - virtual void Move(const Size& rSiz); - virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true); - virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); - virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual void SetAnchorPos(const Point& rPnt); - virtual void SetRelativePos(const Point& rPnt); - virtual void SetSnapRect(const Rectangle& rRect); - virtual void SetLogicRect(const Rectangle& rRect); - - 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 void NbcSetAnchorPos(const Point& rPnt); - virtual void NbcSetRelativePos(const Point& rPnt); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - - virtual void NbcReformatText(); - virtual void ReformatText(); - - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + + virtual long GetRotateAngle() const SAL_OVERRIDE; + virtual long GetShearAngle(bool bVertical = false) const SAL_OVERRIDE; + + virtual void Move(const Size& rSiz) SAL_OVERRIDE; + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; + virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual void SetAnchorPos(const Point& rPnt) SAL_OVERRIDE; + virtual void SetRelativePos(const Point& rPnt) SAL_OVERRIDE; + virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void SetLogicRect(const Rectangle& rRect) 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 void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE; + virtual void NbcSetRelativePos(const Point& rPnt) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + + virtual void NbcReformatText() SAL_OVERRIDE; + virtual void ReformatText() SAL_OVERRIDE; + + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVDOGRP_HXX |