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/source/core/draw | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/core/draw')
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/draw/dview.cxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index f26d2b30afee..5f8a77550a74 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1998,7 +1998,7 @@ namespace sdr * * This method will not handle included hierarchies and not check geometric visibility. */ - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const override; public: VOCOfDrawVirtObj(ObjectContact& rObjectContact, ViewContact& rViewContact) @@ -2017,7 +2017,7 @@ namespace sdr * Always needs to return something. Default is to create a standard ViewObjectContact * containing the given ObjectContact and *this. */ - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override; public: /// basic constructor, used from SdrObject. diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 50b31ddcbeb2..04c10c069b80 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -86,7 +86,7 @@ namespace sdr * * @note ONLY based on model data */ - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: /// basic constructor, used from SdrObject. @@ -156,7 +156,7 @@ namespace drawinglayer protected: /// method which is to be used to implement the local decomposition of a 2D primitive - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: SwVirtFlyDrawObjPrimitive( @@ -168,12 +168,12 @@ namespace drawinglayer { } - virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override; // override to allow callbacks to wrap_DoPaintObject - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; // data read access const SwVirtFlyDrawObj& getSwVirtFlyDrawObj() const { return mrSwVirtFlyDrawObj; } @@ -265,7 +265,7 @@ namespace sdr * * @note ONLY based on model data */ - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const override; public: /// basic constructor, used from SdrObject. diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 55177134fa3a..251b591c2d42 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -64,7 +64,7 @@ class SwSdrHdl : public SdrHdl public: SwSdrHdl(const Point& rPnt, bool bTopRight ) : SdrHdl( rPnt, bTopRight ? HDL_ANCHOR_TR : HDL_ANCHOR ) {} - virtual bool IsFocusHdl() const SAL_OVERRIDE; + virtual bool IsFocusHdl() const override; }; bool SwSdrHdl::IsFocusHdl() const |