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 /include/svx/svddrgmt.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/svddrgmt.hxx')
-rw-r--r-- | include/svx/svddrgmt.hxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 90f161674423..2d4a5864813a 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -58,7 +58,7 @@ public: SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon); virtual ~SdrDragEntryPolyPolygon(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -81,7 +81,7 @@ public: const SdrObject& getOriginal() const { return maOriginal; } SdrObject* getClone() { return mpClone; } - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -97,7 +97,7 @@ public: bool bAddToTransparent); virtual ~SdrDragEntryPrimitive2DSequence(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -112,7 +112,7 @@ public: SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag); virtual ~SdrDragEntryPointGlueDrag(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) override; }; @@ -235,20 +235,20 @@ private: void ImpCheckSnap(const Point& rPt); protected: - virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) SAL_OVERRIDE; + virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) override; public: TYPEINFO_OVERRIDE(); SdrDragMove(SdrDragView& rNewView); - virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; - virtual bool BeginSdrDrag() SAL_OVERRIDE; - virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE; - virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; + virtual void TakeSdrDragComment(OUString& rStr) const override; + virtual bool BeginSdrDrag() override; + virtual void MoveSdrDrag(const Point& rPnt) override; + virtual bool EndSdrDrag(bool bCopy) override; + virtual Pointer GetSdrDragPointer() const override; - virtual basegfx::B2DHomMatrix getCurrentTransformation() SAL_OVERRIDE; - virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; + virtual basegfx::B2DHomMatrix getCurrentTransformation() override; + virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; }; @@ -264,14 +264,14 @@ public: TYPEINFO_OVERRIDE(); SdrDragResize(SdrDragView& rNewView); - virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; - virtual bool BeginSdrDrag() SAL_OVERRIDE; - virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE; - virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; + virtual void TakeSdrDragComment(OUString& rStr) const override; + virtual bool BeginSdrDrag() override; + virtual void MoveSdrDrag(const Point& rPnt) override; + virtual bool EndSdrDrag(bool bCopy) override; + virtual Pointer GetSdrDragPointer() const override; - virtual basegfx::B2DHomMatrix getCurrentTransformation() SAL_OVERRIDE; - virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; + virtual basegfx::B2DHomMatrix getCurrentTransformation() override; + virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; }; @@ -287,18 +287,18 @@ private: SdrObject* mpClone; protected: - virtual void createSdrDragEntries() SAL_OVERRIDE; + virtual void createSdrDragEntries() override; public: TYPEINFO_OVERRIDE(); SdrDragObjOwn(SdrDragView& rNewView); virtual ~SdrDragObjOwn(); - virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; - virtual bool BeginSdrDrag() SAL_OVERRIDE; - virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE; - virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; + virtual void TakeSdrDragComment(OUString& rStr) const override; + virtual bool BeginSdrDrag() override; + virtual void MoveSdrDrag(const Point& rPnt) override; + virtual bool EndSdrDrag(bool bCopy) override; + virtual Pointer GetSdrDragPointer() const override; }; #endif // INCLUDED_SVX_SVDDRGMT_HXX |