diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /sw/inc/dcontact.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/inc/dcontact.hxx')
-rw-r--r-- | sw/inc/dcontact.hxx | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index a08ca490cc23..b5ca6c211e0a 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -192,7 +192,7 @@ private: SwFlyDrawObj* mpMasterObj; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; public: TYPEINFO_OVERRIDE(); @@ -201,22 +201,22 @@ public: SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod ); virtual ~SwFlyDrawContact(); - virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE; - virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) SAL_OVERRIDE; + virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const override; + virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) override; - virtual const SdrObject* GetMaster() const SAL_OVERRIDE; - virtual SdrObject* GetMaster() SAL_OVERRIDE; - virtual void SetMaster( SdrObject* _pNewMaster ) SAL_OVERRIDE; + virtual const SdrObject* GetMaster() const override; + virtual SdrObject* GetMaster() override; + virtual void SetMaster( SdrObject* _pNewMaster ) override; /** override methods to control Writer fly frames, which are linked, and to assure that all objects anchored at/inside the Writer fly frame are also made visible/invisible. */ - virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj ) SAL_OVERRIDE; - virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) SAL_OVERRIDE; + virtual void MoveObjToVisibleLayer( SdrObject* _pDrawObj ) override; + virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj ) override; /** get data collection of anchored objects handled by with contact */ - virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE; + virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const override; }; /** new class for re-direct methods calls at a 'virtual' @@ -238,7 +238,7 @@ class SwDrawVirtObj : public SdrVirtObj /** AW: Need own sdr::contact::ViewContact since AnchorPos from parent is not used but something own (top left of new SnapRect minus top left of original SnapRect) */ - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; public: TYPEINFO_OVERRIDE(); @@ -248,9 +248,9 @@ class SwDrawVirtObj : public SdrVirtObj virtual ~SwDrawVirtObj(); /// access to offset - virtual const Point GetOffset() const SAL_OVERRIDE; + virtual const Point GetOffset() const override; - virtual SwDrawVirtObj* Clone() const SAL_OVERRIDE; + virtual SwDrawVirtObj* Clone() const override; SwDrawVirtObj& operator= (const SwDrawVirtObj& rObj); /// connection to writer layout @@ -268,47 +268,47 @@ class SwDrawVirtObj : public SdrVirtObj / to drawing layer. */ bool IsConnected() const; - virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE; + virtual void NbcSetAnchorPos(const Point& rPnt) override; /// All overridden methods which need to use the offset - virtual void RecalcBoundRect() SAL_OVERRIDE; - virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; - virtual ::basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) 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 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 nAngle, double sn, double cs) SAL_OVERRIDE; - virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; - virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) SAL_OVERRIDE; - virtual void RecalcSnapRect() SAL_OVERRIDE; - virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; - virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; - virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; - virtual Point GetPoint(sal_uInt32 i) const SAL_OVERRIDE; - virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) SAL_OVERRIDE; - - virtual bool HasTextEdit() const SAL_OVERRIDE; - - virtual SdrLayerID GetLayer() const SAL_OVERRIDE; - virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE; - virtual void SetLayer(SdrLayerID nLayer) SAL_OVERRIDE; + virtual void RecalcBoundRect() override; + virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const override; + virtual ::basegfx::B2DPolyPolygon TakeContour() const override; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) 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 void Move(const Size& rSiz) override; + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) override; + virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs) override; + virtual void Mirror(const Point& rRef1, const Point& rRef2) override; + virtual void Shear(const Point& rRef, long nAngle, double tn, bool bVShear) override; + virtual void RecalcSnapRect() override; + virtual const Rectangle& GetSnapRect() const override; + virtual void SetSnapRect(const Rectangle& rRect) override; + virtual void NbcSetSnapRect(const Rectangle& rRect) override; + virtual const Rectangle& GetLogicRect() const override; + virtual void SetLogicRect(const Rectangle& rRect) override; + virtual void NbcSetLogicRect(const Rectangle& rRect) override; + virtual Point GetSnapPoint(sal_uInt32 i) const override; + virtual Point GetPoint(sal_uInt32 i) const override; + virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) override; + + virtual bool HasTextEdit() const override; + + virtual SdrLayerID GetLayer() const override; + virtual void NbcSetLayer(SdrLayerID nLayer) override; + virtual void SetLayer(SdrLayerID nLayer) override; /// FullDrag support - virtual bool supportsFullDrag() const SAL_OVERRIDE; - virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; + virtual bool supportsFullDrag() const override; + virtual SdrObject* getFullDragClone() const override; - virtual void SetBoundRectDirty() SAL_OVERRIDE; - virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; - virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE; + virtual void SetBoundRectDirty() override; + virtual const Rectangle& GetCurrentBoundRect() const override; + virtual const Rectangle& GetLastBoundRect() const override; }; bool CheckControlLayer( const SdrObject *pObj ); @@ -385,7 +385,7 @@ class SwDrawContact : public SwContact protected: /// virtuelle Methoden von SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; public: TYPEINFO_OVERRIDE(); @@ -393,12 +393,12 @@ class SwDrawContact : public SwContact SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj ); virtual ~SwDrawContact(); - virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE; - virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) SAL_OVERRIDE; + virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const override; + virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) override; - virtual const SdrObject* GetMaster() const SAL_OVERRIDE; - virtual SdrObject* GetMaster() SAL_OVERRIDE; - virtual void SetMaster( SdrObject* _pNewMaster ) SAL_OVERRIDE; + virtual const SdrObject* GetMaster() const override; + virtual SdrObject* GetMaster() override; + virtual void SetMaster( SdrObject* _pNewMaster ) override; const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = 0L ) const; SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = 0L ); @@ -443,7 +443,7 @@ class SwDrawContact : public SwContact SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm ); /// Virtual methods of SdrObjUserCall. - virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) SAL_OVERRIDE; + virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) override; /** Used by Changed() and by UndoDraw. Notifies paragraphs that have to get out of the way. */ @@ -460,7 +460,7 @@ class SwDrawContact : public SwContact */ static void GetTextObjectsFromFormat( std::list<SdrTextObj*>&, SwDoc* ); - virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE; + virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const override; }; #endif |