diff options
Diffstat (limited to 'slideshow/source/engine/slide')
| -rw-r--r-- | slideshow/source/engine/slide/layermanager.cxx | 22 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/shapemanagerimpl.hxx | 40 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/slideimpl.cxx | 38 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/userpaintoverlay.cxx | 30 |
4 files changed, 65 insertions, 65 deletions
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index 332da3d823c1..7b8cb636ca37 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -551,61 +551,61 @@ namespace slideshow { } - virtual bool isOnView(std::shared_ptr<View> const& /*rView*/) const SAL_OVERRIDE + virtual bool isOnView(std::shared_ptr<View> const& /*rView*/) const override { return true; // visible on all views } - virtual ::cppcanvas::CanvasSharedPtr getCanvas() const SAL_OVERRIDE + virtual ::cppcanvas::CanvasSharedPtr getCanvas() const override { return mpCanvas; } - virtual void clear() const SAL_OVERRIDE + virtual void clear() const override { // NOOP } - virtual void clearAll() const SAL_OVERRIDE + virtual void clearAll() const override { // NOOP } virtual ::cppcanvas::CustomSpriteSharedPtr createSprite( const ::basegfx::B2DSize& /*rSpriteSizePixel*/, - double /*nSpritePrio*/ ) const SAL_OVERRIDE + double /*nSpritePrio*/ ) const override { ENSURE_OR_THROW( false, "DummyLayer::createSprite(): This method is not supposed to be called!" ); return ::cppcanvas::CustomSpriteSharedPtr(); } - virtual void setPriority( const basegfx::B1DRange& /*rRange*/ ) SAL_OVERRIDE + virtual void setPriority( const basegfx::B1DRange& /*rRange*/ ) override { OSL_FAIL( "BitmapView::setPriority(): This method is not supposed to be called!" ); } - virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const SAL_OVERRIDE + virtual ::com::sun::star::geometry::IntegerSize2D getTranslationOffset() const override { return geometry::IntegerSize2D(0,0); } - virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE + virtual ::basegfx::B2DHomMatrix getTransformation() const override { return mpCanvas->getTransformation(); } - virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const SAL_OVERRIDE + virtual ::basegfx::B2DHomMatrix getSpriteTransformation() const override { OSL_FAIL( "BitmapView::getSpriteTransformation(): This method is not supposed to be called!" ); return ::basegfx::B2DHomMatrix(); } - virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ ) SAL_OVERRIDE + virtual void setClip( const ::basegfx::B2DPolyPolygon& /*rClip*/ ) override { OSL_FAIL( "BitmapView::setClip(): This method is not supposed to be called!" ); } - virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ ) SAL_OVERRIDE + virtual bool resize( const ::basegfx::B2DRange& /*rArea*/ ) override { OSL_FAIL( "BitmapView::resize(): This method is not supposed to be called!" ); return false; diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 651111bed88e..611f33d9d3d8 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -87,7 +87,7 @@ public: // Disposable interface - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: @@ -95,32 +95,32 @@ private: virtual bool handleMousePressed( - ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE; + ::com::sun::star::awt::MouseEvent const& evt ) override; virtual bool handleMouseReleased( - ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE; + ::com::sun::star::awt::MouseEvent const& evt ) override; virtual bool handleMouseDragged( - ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE; + ::com::sun::star::awt::MouseEvent const& evt ) override; virtual bool handleMouseMoved( - ::com::sun::star::awt::MouseEvent const& evt ) SAL_OVERRIDE; + ::com::sun::star::awt::MouseEvent const& evt ) override; // ViewUpdate interface - virtual bool update() SAL_OVERRIDE; - virtual bool needsUpdate() const SAL_OVERRIDE; + virtual bool update() override; + virtual bool needsUpdate() const override; // ShapeManager interface - virtual void enterAnimationMode( const AnimatableShapeSharedPtr& rShape ) SAL_OVERRIDE; - virtual void leaveAnimationMode( const AnimatableShapeSharedPtr& rShape ) SAL_OVERRIDE; - virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape ) SAL_OVERRIDE; + virtual void enterAnimationMode( const AnimatableShapeSharedPtr& rShape ) override; + virtual void leaveAnimationMode( const AnimatableShapeSharedPtr& rShape ) override; + virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape ) override; virtual ShapeSharedPtr lookupShape( ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape > const & xShape ) const SAL_OVERRIDE; - virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ) SAL_OVERRIDE; + ::com::sun::star::drawing::XShape > const & xShape ) const override; + virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ) override; // SubsettableShapeManager interface @@ -128,17 +128,17 @@ private: virtual boost::shared_ptr<AttributableShape> getSubsetShape( const boost::shared_ptr<AttributableShape>& rOrigShape, - const DocTreeNode& rTreeNode ) SAL_OVERRIDE; + const DocTreeNode& rTreeNode ) override; virtual void revokeSubset( const boost::shared_ptr<AttributableShape>& rOrigShape, - const boost::shared_ptr<AttributableShape>& rSubsetShape ) SAL_OVERRIDE; + const boost::shared_ptr<AttributableShape>& rSubsetShape ) override; virtual void addIntrinsicAnimationHandler( - const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) SAL_OVERRIDE; + const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) override; virtual void removeIntrinsicAnimationHandler( - const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) SAL_OVERRIDE; - virtual bool notifyIntrinsicAnimationsEnabled() SAL_OVERRIDE; - virtual bool notifyIntrinsicAnimationsDisabled() SAL_OVERRIDE; + const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) override; + virtual bool notifyIntrinsicAnimationsEnabled() override; + virtual bool notifyIntrinsicAnimationsDisabled() override; // ShapeListenerEventHandler @@ -147,12 +147,12 @@ private: virtual bool listenerAdded( const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XShapeEventListener>& xListener, const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape ) SAL_OVERRIDE; + ::com::sun::star::drawing::XShape>& xShape ) override; virtual bool listenerRemoved( const ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XShapeEventListener>& xListener, const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape ) SAL_OVERRIDE; + ::com::sun::star::drawing::XShape>& xShape ) override; // ShapeCursorEventHandler interface diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 0e2cf1a614aa..bff4c491babf 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -108,36 +108,36 @@ public: // Slide interface - virtual bool prefetch() SAL_OVERRIDE; - virtual bool show( bool ) SAL_OVERRIDE; - virtual void hide() SAL_OVERRIDE; + virtual bool prefetch() override; + virtual bool show( bool ) override; + virtual void hide() override; - virtual basegfx::B2ISize getSlideSize() const SAL_OVERRIDE; - virtual uno::Reference<drawing::XDrawPage > getXDrawPage() const SAL_OVERRIDE; - virtual uno::Reference<animations::XAnimationNode> getXAnimationNode() const SAL_OVERRIDE; - virtual PolyPolygonVector getPolygons() SAL_OVERRIDE; - virtual void drawPolygons() const SAL_OVERRIDE; - virtual bool isPaintOverlayActive() const SAL_OVERRIDE; - virtual void enablePaintOverlay() SAL_OVERRIDE; - virtual void disablePaintOverlay() SAL_OVERRIDE; - virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) SAL_OVERRIDE; + virtual basegfx::B2ISize getSlideSize() const override; + virtual uno::Reference<drawing::XDrawPage > getXDrawPage() const override; + virtual uno::Reference<animations::XAnimationNode> getXAnimationNode() const override; + virtual PolyPolygonVector getPolygons() override; + virtual void drawPolygons() const override; + virtual bool isPaintOverlayActive() const override; + virtual void enablePaintOverlay() override; + virtual void disablePaintOverlay() override; + virtual void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) override; // TODO(F2): Rework SlideBitmap to no longer be based on XBitmap, // but on canvas-independent basegfx bitmaps - virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const SAL_OVERRIDE; + virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const override; private: // ViewEventHandler - virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; - virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; - virtual void viewChanged( const UnoViewSharedPtr& rView ) SAL_OVERRIDE; - virtual void viewsChanged() SAL_OVERRIDE; + virtual void viewAdded( const UnoViewSharedPtr& rView ) override; + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override; + virtual void viewChanged( const UnoViewSharedPtr& rView ) override; + virtual void viewsChanged() 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; void activatePaintOverlay(); void deactivatePaintOverlay(); diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index 960794fbf1fa..cd7437be1daf 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -87,31 +87,31 @@ namespace slideshow } // ViewEventHandler methods - virtual void viewAdded( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewAdded( const UnoViewSharedPtr& rView ) override { maViews.push_back( rView ); } - virtual void viewRemoved( const UnoViewSharedPtr& rView ) SAL_OVERRIDE + virtual void viewRemoved( const UnoViewSharedPtr& rView ) override { maViews.erase( ::std::remove( maViews.begin(), maViews.end(), rView ) ); } - virtual void viewChanged( const UnoViewSharedPtr& /*rView*/ ) SAL_OVERRIDE + virtual void viewChanged( const UnoViewSharedPtr& /*rView*/ ) override { // TODO(F2): for persistent drawings, need to store // polygon and repaint here. } - virtual void viewsChanged() SAL_OVERRIDE + virtual void viewsChanged() override { // TODO(F2): for persistent drawings, need to store // polygon and repaint here. } - bool colorChanged( RGBColor const& rUserColor ) SAL_OVERRIDE + bool colorChanged( RGBColor const& rUserColor ) override { mbIsLastPointValid = false; mbActive = true; @@ -120,7 +120,7 @@ namespace slideshow return true; } - bool widthChanged( double nUserStrokeWidth ) SAL_OVERRIDE + bool widthChanged( double nUserStrokeWidth ) override { this->mnStrokeWidth = nUserStrokeWidth; mbIsEraseModeActivated = false; @@ -162,7 +162,7 @@ namespace slideshow } } - bool eraseAllInkChanged( bool const& rEraseAllInk ) SAL_OVERRIDE + bool eraseAllInkChanged( bool const& rEraseAllInk ) override { this->mbIsEraseAllModeActivated= rEraseAllInk; // if the erase all mode is activated it will remove all ink from slide, @@ -178,7 +178,7 @@ namespace slideshow return true; } - bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) SAL_OVERRIDE + bool eraseInkWidthChanged( sal_Int32 rEraseInkSize ) override { // Change the size this->mnSize=rEraseInkSize; @@ -187,7 +187,7 @@ namespace slideshow return true; } - bool switchPenMode() SAL_OVERRIDE + bool switchPenMode() override { mbIsLastPointValid = false; mbActive = true; @@ -195,7 +195,7 @@ namespace slideshow return true; } - bool switchEraserMode() SAL_OVERRIDE + bool switchEraserMode() override { mbIsLastPointValid = false; mbActive = true; @@ -203,7 +203,7 @@ namespace slideshow return true; } - bool disable() SAL_OVERRIDE + bool disable() override { mbIsLastPointValid = false; mbIsLastMouseDownPosValid = false; @@ -231,7 +231,7 @@ namespace slideshow } // MouseEventHandler methods - virtual bool handleMousePressed( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMousePressed( const awt::MouseEvent& e ) override { if( !mbActive ) return false; @@ -254,7 +254,7 @@ namespace slideshow return true; } - virtual bool handleMouseReleased( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseReleased( const awt::MouseEvent& e ) override { if( !mbActive ) return false; @@ -291,7 +291,7 @@ namespace slideshow return true; } - virtual bool handleMouseDragged( const awt::MouseEvent& e ) SAL_OVERRIDE + virtual bool handleMouseDragged( const awt::MouseEvent& e ) override { if( !mbActive ) return false; @@ -410,7 +410,7 @@ namespace slideshow return true; } - virtual bool handleMouseMoved( const awt::MouseEvent& /*e*/ ) SAL_OVERRIDE + virtual bool handleMouseMoved( const awt::MouseEvent& /*e*/ ) override { // not used here return false; // did not handle the event |