summaryrefslogtreecommitdiff
path: root/cppcanvas/source/wrapper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 16:37:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 16:39:26 +0100
commit70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch)
treea70f4957c454b443520cbf91250c41d9eea80017 /cppcanvas/source/wrapper
parent8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff)
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
Diffstat (limited to 'cppcanvas/source/wrapper')
-rw-r--r--cppcanvas/source/wrapper/implbitmap.hxx8
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.hxx4
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx22
-rw-r--r--cppcanvas/source/wrapper/implcolor.hxx4
-rw-r--r--cppcanvas/source/wrapper/implcustomsprite.hxx2
-rw-r--r--cppcanvas/source/wrapper/implfont.hxx6
-rw-r--r--cppcanvas/source/wrapper/implpolypolygon.hxx20
-rw-r--r--cppcanvas/source/wrapper/implsprite.hxx22
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.hxx12
9 files changed, 50 insertions, 50 deletions
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