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 /slideshow/source/engine/usereventqueue.cxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'slideshow/source/engine/usereventqueue.cxx')
| -rw-r--r-- | slideshow/source/engine/usereventqueue.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index 6eb579c77017..4f38849d022d 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -61,10 +61,10 @@ typedef std::map<ShapeSharedPtr, ImpEventQueue, class MouseEventHandler_ : public MouseEventHandler { public: - virtual bool handleMousePressed( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false;} - virtual bool handleMouseReleased( awt::MouseEvent const& /*e*/) SAL_OVERRIDE { return false;} - virtual bool handleMouseDragged( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false;} - virtual bool handleMouseMoved( awt::MouseEvent const& /*e*/ ) SAL_OVERRIDE { return false; } + virtual bool handleMousePressed( awt::MouseEvent const& /*e*/ ) override { return false;} + virtual bool handleMouseReleased( awt::MouseEvent const& /*e*/) override { return false;} + virtual bool handleMouseDragged( awt::MouseEvent const& /*e*/ ) override { return false;} + virtual bool handleMouseMoved( awt::MouseEvent const& /*e*/ ) override { return false; } }; /** @return one event has been posted @@ -126,7 +126,7 @@ public: maAnimationEventMap() {} - virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE + virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) override { ENSURE_OR_RETURN_FALSE( rNode, @@ -193,13 +193,13 @@ public: private: // triggered by API calls, e.g. space bar - virtual bool handleEvent() SAL_OVERRIDE + virtual bool handleEvent() override { return handleEvent_impl(); } // triggered by mouse release: - virtual bool handleMouseReleased( const awt::MouseEvent& evt ) SAL_OVERRIDE + virtual bool handleMouseReleased( const awt::MouseEvent& evt ) override { if(evt.Buttons != awt::MouseButton::LEFT) return false; @@ -245,7 +245,7 @@ public: void skipEffect() { handleEvent_impl(false); } private: - virtual bool handleEvent_impl() SAL_OVERRIDE + virtual bool handleEvent_impl() override { return handleEvent_impl(true); } @@ -391,14 +391,14 @@ public: mrCursorManager( rCursorManager ) {} - virtual bool handleMouseReleased( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseReleased( const awt::MouseEvent& e ) override { if(e.Buttons != awt::MouseButton::LEFT) return false; return processEvent( e ); } - virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseMoved( const awt::MouseEvent& e ) override { // TODO(P2): Maybe buffer last shape touched @@ -423,7 +423,7 @@ public: : MouseHandlerBase( rEventQueue ), mpLastShape() {} - virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseMoved( const awt::MouseEvent& e ) override { // TODO(P2): Maybe buffer last shape touched, and // check against that _first_ @@ -461,7 +461,7 @@ public: : MouseHandlerBase( rEventQueue ), maLastIter() {} - virtual bool handleMouseMoved( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseMoved( const awt::MouseEvent& e ) override { // TODO(P2): Maybe buffer last shape touched, and // check against that _first_ |