From 70cc2b191b95fbc210bc1f0f6a7159f341894f0f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 26 Mar 2014 16:37:00 +0100 Subject: First batch of adding SAL_OVERRRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a --- cppcanvas/source/inc/canvasgraphichelper.hxx | 14 +++--- cppcanvas/source/inc/implrenderer.hxx | 6 +-- cppcanvas/source/mtfrenderer/bitmapaction.cxx | 10 ++-- .../source/mtfrenderer/cachedprimitivebase.hxx | 2 +- cppcanvas/source/mtfrenderer/lineaction.cxx | 10 ++-- cppcanvas/source/mtfrenderer/pointaction.cxx | 10 ++-- cppcanvas/source/mtfrenderer/polypolyaction.cxx | 30 +++++------ cppcanvas/source/mtfrenderer/textaction.cxx | 58 +++++++++++----------- .../source/mtfrenderer/transparencygroupaction.cxx | 10 ++-- cppcanvas/source/uno/uno_mtfrenderer.hxx | 8 +-- cppcanvas/source/wrapper/implbitmap.hxx | 8 +-- cppcanvas/source/wrapper/implbitmapcanvas.hxx | 4 +- cppcanvas/source/wrapper/implcanvas.hxx | 22 ++++---- cppcanvas/source/wrapper/implcolor.hxx | 4 +- cppcanvas/source/wrapper/implcustomsprite.hxx | 2 +- cppcanvas/source/wrapper/implfont.hxx | 6 +-- cppcanvas/source/wrapper/implpolypolygon.hxx | 20 ++++---- cppcanvas/source/wrapper/implsprite.hxx | 22 ++++---- cppcanvas/source/wrapper/implspritecanvas.hxx | 12 ++--- 19 files changed, 129 insertions(+), 129 deletions(-) (limited to 'cppcanvas/source') diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx index f0ab8bce88c3..ec607aed8169 100644 --- a/cppcanvas/source/inc/canvasgraphichelper.hxx +++ b/cppcanvas/source/inc/canvasgraphichelper.hxx @@ -47,13 +47,13 @@ namespace cppcanvas CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ); // CanvasGraphic implementation - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); - virtual ::basegfx::B2DHomMatrix getTransformation() const; - virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ); - virtual void setClip(); - virtual ::basegfx::B2DPolyPolygon const* getClip() const; - virtual void setCompositeOp( CompositeOp aOp ); - virtual CompositeOp getCompositeOp() const; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE; + virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE; + virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) SAL_OVERRIDE; + virtual void setClip() SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon const* getClip() const SAL_OVERRIDE; + virtual void setCompositeOp( CompositeOp aOp ) SAL_OVERRIDE; + virtual CompositeOp getCompositeOp() const SAL_OVERRIDE; protected: // for our clients diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 55fe6f132c1b..65593876155a 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -192,11 +192,11 @@ static float GetSwapFloat( SvStream& rSt ) virtual ~ImplRenderer(); - virtual bool draw() const; + virtual bool draw() const SAL_OVERRIDE; virtual bool drawSubset( sal_Int32 nStartIndex, - sal_Int32 nEndIndex ) const; + sal_Int32 nEndIndex ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getSubsetArea( sal_Int32 nStartIndex, - sal_Int32 nEndIndex ) const; + sal_Int32 nEndIndex ) const SAL_OVERRIDE; // element of the Renderer's action vector. Need to be diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index d3b61fa1d4a4..14fea4effaec 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -61,18 +61,18 @@ namespace cppcanvas const OutDevState& ); virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: using Action::render; virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; uno::Reference< rendering::XBitmap > mxBitmap; CanvasSharedPtr mpCanvas; diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx index e7b4248473eb..5a86f5af804d 100644 --- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx +++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx @@ -65,7 +65,7 @@ namespace cppcanvas bool bOnlyRedrawWithSameTransform ); virtual ~CachedPrimitiveBase() {} - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; protected: using Action::render; diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx index 6553f34657a1..b6d6ca7de2ad 100644 --- a/cppcanvas/source/mtfrenderer/lineaction.cxx +++ b/cppcanvas/source/mtfrenderer/lineaction.cxx @@ -54,15 +54,15 @@ namespace cppcanvas const CanvasSharedPtr&, const OutDevState& ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: ::basegfx::B2DPoint maStartPoint; diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx index 3349e57996b5..6e6a048b4b81 100644 --- a/cppcanvas/source/mtfrenderer/pointaction.cxx +++ b/cppcanvas/source/mtfrenderer/pointaction.cxx @@ -55,15 +55,15 @@ namespace cppcanvas const OutDevState&, const ::Color& ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: // default: disabled copy/assignment diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx index c86757847652..5aad2993db81 100644 --- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx +++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx @@ -63,18 +63,18 @@ namespace cppcanvas int nTransparency ); virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: using Action::render; virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly; const ::basegfx::B2DRange maBounds; @@ -240,18 +240,18 @@ namespace cppcanvas const rendering::Texture& rTexture ); virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: using Action::render; virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly; const ::basegfx::B2DRectangle maBounds; @@ -354,18 +354,18 @@ namespace cppcanvas const rendering::StrokeAttributes& rStrokeAttributes ); virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: using Action::render; virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive, - const ::basegfx::B2DHomMatrix& rTransformation ) const; + const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; const uno::Reference< rendering::XPolyPolygon2D > mxPolyPoly; const ::basegfx::B2DRectangle maBounds; diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 2bab8aaa7629..f001f67b7bb3 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -631,15 +631,15 @@ namespace cppcanvas const OutDevState& rState, const ::basegfx::B2DHomMatrix& rTextTransform ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: // TODO(P2): This is potentially a real mass object @@ -797,19 +797,19 @@ namespace cppcanvas const OutDevState& rState, const ::basegfx::B2DHomMatrix& rTextTransform ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: /// Interface TextRenderer - virtual bool operator()( const rendering::RenderState& rRenderState ) const; + virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE; // TODO(P2): This is potentially a real mass object // (every character might be a separate TextAction), @@ -1027,15 +1027,15 @@ namespace cppcanvas const OutDevState& rState, const ::basegfx::B2DHomMatrix& rTextTransform ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: // TODO(P2): This is potentially a real mass object @@ -1217,19 +1217,19 @@ namespace cppcanvas const OutDevState& rState, const ::basegfx::B2DHomMatrix& rTextTransform ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: // TextRenderer interface - virtual bool operator()( const rendering::RenderState& rRenderState ) const; + virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE; // TODO(P2): This is potentially a real mass object // (every character might be a separate TextAction), @@ -1381,7 +1381,7 @@ namespace cppcanvas } // TextRenderer interface - virtual bool operator()( const rendering::RenderState& rRenderState ) const + virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE { mrCanvas->fillPolyPolygon( mrLinePolygon, mrViewState, @@ -1555,19 +1555,19 @@ namespace cppcanvas const OutDevState& rState, const ::basegfx::B2DHomMatrix& rTextTransform ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: // TextRenderer interface - virtual bool operator()( const rendering::RenderState& rRenderState ) const; + virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE; // TODO(P2): This is potentially a real mass object // (every character might be a separate TextAction), diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx index 8254320de978..ee1281bb1cb1 100644 --- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx +++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx @@ -95,15 +95,15 @@ namespace cppcanvas const CanvasSharedPtr& rCanvas, const OutDevState& rState ); - virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const; + virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation, - const Subset& rSubset ) const; + const Subset& rSubset ) const SAL_OVERRIDE; - virtual sal_Int32 getActionCount() const; + virtual sal_Int32 getActionCount() const SAL_OVERRIDE; private: MtfAutoPtr mpGroupMtf; diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx index 5e72fdc7d034..64d8f4d1bbf9 100644 --- a/cppcanvas/source/uno/uno_mtfrenderer.hxx +++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx @@ -26,13 +26,13 @@ public: com::sun::star::uno::Reference const&); // XMtfRenderer iface - void SAL_CALL setMetafile (const ::com::sun::star::uno::Sequence< sal_Int8 >& rMtf) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL draw (double fScaleX, double fScaleY) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setMetafile (const ::com::sun::star::uno::Sequence< sal_Int8 >& rMtf) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL draw (double fScaleX, double fScaleY) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet // setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::com::sun::star::uno::Any(); } - virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::com::sun::star::uno::Any(); } + virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: GDIMetaFile* mpMetafile; diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx index d080e3c0e589..a446079f340d 100644 --- a/cppcanvas/source/wrapper/implbitmap.hxx +++ b/cppcanvas/source/wrapper/implbitmap.hxx @@ -47,14 +47,14 @@ namespace cppcanvas virtual ~ImplBitmap(); // CanvasGraphic implementation (that was not already implemented by CanvasGraphicHelper) - virtual bool draw() const; - virtual bool drawAlphaModulated( double nAlphaModulation ) const; + virtual bool draw() const SAL_OVERRIDE; + virtual bool drawAlphaModulated( double nAlphaModulation ) const SAL_OVERRIDE; - virtual BitmapCanvasSharedPtr getBitmapCanvas() const; + virtual BitmapCanvasSharedPtr getBitmapCanvas() const SAL_OVERRIDE; // Bitmap implementation virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XBitmap > getUNOBitmap() const; + ::com::sun::star::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE; private: // default: disabled copy/assignment diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index 705125360e03..5a96a3835df1 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -42,9 +42,9 @@ namespace cppcanvas ::com::sun::star::rendering::XBitmapCanvas >& rCanvas ); virtual ~ImplBitmapCanvas(); - virtual ::basegfx::B2ISize getSize() const; + virtual ::basegfx::B2ISize getSize() const SAL_OVERRIDE; - virtual CanvasSharedPtr clone() const; + virtual CanvasSharedPtr clone() const SAL_OVERRIDE; // take compiler-provided default copy constructor //ImplBitmapCanvas(const ImplBitmapCanvas&); diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index cda88f564664..63de9d4f87f1 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -54,25 +54,25 @@ namespace cppcanvas ::com::sun::star::rendering::XCanvas >& rCanvas ); virtual ~ImplCanvas(); - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); - virtual ::basegfx::B2DHomMatrix getTransformation() const; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE; + virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE; - virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ); - virtual void setClip(); - virtual ::basegfx::B2DPolyPolygon const* getClip() const; + virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) SAL_OVERRIDE; + virtual void setClip() SAL_OVERRIDE; + virtual ::basegfx::B2DPolyPolygon const* getClip() const SAL_OVERRIDE; - virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const; + virtual FontSharedPtr createFont( const OUString& rFontName, const double& rCellSize ) const SAL_OVERRIDE; - virtual ColorSharedPtr createColor() const; + virtual ColorSharedPtr createColor() const SAL_OVERRIDE; - virtual CanvasSharedPtr clone() const; + virtual CanvasSharedPtr clone() const SAL_OVERRIDE; - virtual void clear() const; + virtual void clear() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvas > getUNOCanvas() const; + ::com::sun::star::rendering::XCanvas > getUNOCanvas() const SAL_OVERRIDE; - virtual ::com::sun::star::rendering::ViewState getViewState() const; + virtual ::com::sun::star::rendering::ViewState getViewState() const SAL_OVERRIDE; // take compiler-provided default copy constructor //ImplCanvas(const ImplCanvas&); diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx index 8bb5ed601800..69ac454e8c3a 100644 --- a/cppcanvas/source/wrapper/implcolor.hxx +++ b/cppcanvas/source/wrapper/implcolor.hxx @@ -41,8 +41,8 @@ namespace cppcanvas ::com::sun::star::rendering::XGraphicDevice >& rDevice ); virtual ~ImplColor(); - virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const; - virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const; + virtual IntSRGBA getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxDevice; diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx index 0c4bf3d8d3af..f3e5dff0e571 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.hxx +++ b/cppcanvas/source/wrapper/implcustomsprite.hxx @@ -45,7 +45,7 @@ namespace cppcanvas const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); virtual ~ImplCustomSprite(); - virtual CanvasSharedPtr getContentCanvas() const; + virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE; private: // default: disabled copy/assignment diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx index 8dd46adb94d9..c754ab1449e0 100644 --- a/cppcanvas/source/wrapper/implfont.hxx +++ b/cppcanvas/source/wrapper/implfont.hxx @@ -51,11 +51,11 @@ namespace cppcanvas virtual ~ImplFont(); - virtual OUString getName() const; - virtual double getCellSize() const; + virtual OUString getName() const SAL_OVERRIDE; + virtual double getCellSize() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvasFont > getUNOFont() const; + ::com::sun::star::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > mxCanvas; diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx index 1503ed05818f..fdfc19d548b9 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.hxx +++ b/cppcanvas/source/wrapper/implpolypolygon.hxx @@ -48,21 +48,21 @@ namespace cppcanvas virtual ~ImplPolyPolygon(); - virtual void addPolygon( const ::basegfx::B2DPolygon& rPoly ); - virtual void addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ); + virtual void addPolygon( const ::basegfx::B2DPolygon& rPoly ) SAL_OVERRIDE; + virtual void addPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly ) SAL_OVERRIDE; - virtual void setRGBAFillColor( Color::IntSRGBA ); - virtual void setRGBALineColor( Color::IntSRGBA ); - virtual Color::IntSRGBA getRGBAFillColor() const; - virtual Color::IntSRGBA getRGBALineColor() const; + virtual void setRGBAFillColor( Color::IntSRGBA ) SAL_OVERRIDE; + virtual void setRGBALineColor( Color::IntSRGBA ) SAL_OVERRIDE; + virtual Color::IntSRGBA getRGBAFillColor() const SAL_OVERRIDE; + virtual Color::IntSRGBA getRGBALineColor() const SAL_OVERRIDE; - virtual void setStrokeWidth( const double& rStrokeWidth ); - virtual double getStrokeWidth() const; + virtual void setStrokeWidth( const double& rStrokeWidth ) SAL_OVERRIDE; + virtual double getStrokeWidth() const SAL_OVERRIDE; - virtual bool draw() const; + virtual bool draw() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const; + ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE; private: // default: disabled copy/assignment diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index 73dd7e49d2f1..290fe9548831 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -44,21 +44,21 @@ namespace cppcanvas const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); virtual ~ImplSprite(); - virtual void setAlpha( const double& rAlpha ); - virtual void movePixel( const ::basegfx::B2DPoint& rNewPos ); - virtual void move( const ::basegfx::B2DPoint& rNewPos ); - virtual void transform( const ::basegfx::B2DHomMatrix& rMatrix ); - virtual void setClipPixel( const ::basegfx::B2DPolyPolygon& rClipPoly ); - virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ); - virtual void setClip(); + virtual void setAlpha( const double& rAlpha ) SAL_OVERRIDE; + virtual void movePixel( const ::basegfx::B2DPoint& rNewPos ) SAL_OVERRIDE; + virtual void move( const ::basegfx::B2DPoint& rNewPos ) SAL_OVERRIDE; + virtual void transform( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE; + virtual void setClipPixel( const ::basegfx::B2DPolyPolygon& rClipPoly ) SAL_OVERRIDE; + virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) SAL_OVERRIDE; + virtual void setClip() SAL_OVERRIDE; - virtual void show(); - virtual void hide(); + virtual void show() SAL_OVERRIDE; + virtual void hide() SAL_OVERRIDE; - virtual void setPriority( double fPriority ); + virtual void setPriority( double fPriority ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSprite > getUNOSprite() const; + ::com::sun::star::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE; private: // default: disabled copy/assignment diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index 1999c5630ff0..60cd52e2563e 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -45,17 +45,17 @@ namespace cppcanvas virtual ~ImplSpriteCanvas(); - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ); + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE; - virtual bool updateScreen( bool bUpdateAll ) const; + virtual bool updateScreen( bool bUpdateAll ) const SAL_OVERRIDE; - virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const; - virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const; + virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const SAL_OVERRIDE; + virtual SpriteSharedPtr createClonedSprite( const SpriteSharedPtr& ) const SAL_OVERRIDE; - virtual CanvasSharedPtr clone() const; + virtual CanvasSharedPtr clone() const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const; + ::com::sun::star::rendering::XSpriteCanvas > getUNOSpriteCanvas() const SAL_OVERRIDE; /** This class passes the view transformation to child sprites -- cgit