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/slideshowimpl.cxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'slideshow/source/engine/slideshowimpl.cxx')
-rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 039f4ae240ba..518afe330703 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -275,58 +275,58 @@ public: private: // XSlideShow: - virtual sal_Bool SAL_CALL nextEffect() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL nextEffect() throw (uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL previousEffect() throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL startShapeActivity( uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL stopShapeActivity( uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL pause( sal_Bool bPauseShow ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual uno::Reference<drawing::XDrawPage> SAL_CALL getCurrentSlide() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL displaySlide( uno::Reference<drawing::XDrawPage> const& xSlide, uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages, uno::Reference<animations::XAnimationNode> const& xRootNode, uno::Sequence<beans::PropertyValue> const& rProperties ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL registerUserPaintPolygons( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xDocFactory ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerUserPaintPolygons( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xDocFactory ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL setProperty( - beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + beans::PropertyValue const& rProperty ) throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL addView( uno::Reference<presentation::XSlideShowView> const& xView ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL removeView( uno::Reference<presentation::XSlideShowView> const& xView ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL update( double & nNextTimeout ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL addSlideShowListener( uno::Reference<presentation::XSlideShowListener> const& xListener ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeSlideShowListener( uno::Reference<presentation::XSlideShowListener> const& xListener ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL addShapeEventListener( uno::Reference<presentation::XShapeEventListener> const& xListener, uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeShapeEventListener( uno::Reference<presentation::XShapeEventListener> const& xListener, uno::Reference<drawing::XShape> const& xShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual void SAL_CALL setShapeCursor( uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // CursorManager - virtual bool requestCursor( sal_Int16 nCursorShape ) SAL_OVERRIDE; - virtual void resetCursor() SAL_OVERRIDE; + virtual bool requestCursor( sal_Int16 nCursorShape ) override; + virtual void resetCursor() override; /** This is somewhat similar to displaySlide when called for the current slide. It has been simplified to take advantage of that no slide @@ -337,7 +337,7 @@ private: protected: // WeakComponentImplHelperBase - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; bool isDisposed() const { @@ -521,7 +521,7 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, SeparateListenerImpl& operator=( const SeparateListenerImpl& ) = delete; // EventHandler - virtual bool handleEvent() SAL_OVERRIDE + virtual bool handleEvent() override { // DON't call notifySlideAnimationsEnded() // directly, but queue an event. handleEvent() @@ -538,20 +538,20 @@ struct SlideShowImpl::SeparateListenerImpl : public EventHandler, } // ViewRepaintHandler - virtual void viewClobbered( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewClobbered( const UnoViewSharedPtr& rView ) override { // given view needs repaint, request update mrScreenUpdater.notifyUpdate(rView, true); } // HyperlinkHandler - virtual bool handleHyperlink( OUString const& rLink ) SAL_OVERRIDE + virtual bool handleHyperlink( OUString const& rLink ) override { return mrShow.notifyHyperLinkClicked(rLink); } // AnimationEventHandler - virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) SAL_OVERRIDE + virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) override { return mrShow.handleAnimationEvent(rNode); } |