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 /cppcanvas/source/wrapper | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'cppcanvas/source/wrapper')
-rw-r--r-- | cppcanvas/source/wrapper/implbitmap.hxx | 8 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implbitmapcanvas.hxx | 4 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implcanvas.hxx | 20 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implcolor.hxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implcustomsprite.hxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implpolypolygon.hxx | 14 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implsprite.hxx | 22 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.hxx | 10 |
8 files changed, 41 insertions, 41 deletions
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx index f6c75cb4d04d..24d8af50a3db 100644 --- a/cppcanvas/source/wrapper/implbitmap.hxx +++ b/cppcanvas/source/wrapper/implbitmap.hxx @@ -46,13 +46,13 @@ namespace cppcanvas virtual ~ImplBitmap(); // CanvasGraphic implementation (that was not already implemented by CanvasGraphicHelper) - virtual bool draw() const SAL_OVERRIDE; - virtual bool drawAlphaModulated( double nAlphaModulation ) const SAL_OVERRIDE; + virtual bool draw() const override; + virtual bool drawAlphaModulated( double nAlphaModulation ) const override; - virtual BitmapCanvasSharedPtr getBitmapCanvas() const SAL_OVERRIDE; + virtual BitmapCanvasSharedPtr getBitmapCanvas() const override; // Bitmap implementation - virtual css::uno::Reference< css::rendering::XBitmap > getUNOBitmap() const SAL_OVERRIDE; + virtual css::uno::Reference< css::rendering::XBitmap > getUNOBitmap() const override; private: ImplBitmap(const ImplBitmap&) = delete; diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index cf176ee8ab7f..75931bd575f5 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -39,9 +39,9 @@ namespace cppcanvas explicit ImplBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& rCanvas ); virtual ~ImplBitmapCanvas(); - virtual ::basegfx::B2ISize getSize() const SAL_OVERRIDE; + virtual ::basegfx::B2ISize getSize() const override; - virtual CanvasSharedPtr clone() const SAL_OVERRIDE; + virtual CanvasSharedPtr clone() const 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 f7b971d699aa..0499280fbedd 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -53,23 +53,23 @@ namespace cppcanvas explicit ImplCanvas( const css::uno::Reference< css::rendering::XCanvas >& rCanvas ); virtual ~ImplCanvas(); - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE; - virtual ::basegfx::B2DHomMatrix getTransformation() const SAL_OVERRIDE; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override; + virtual ::basegfx::B2DHomMatrix getTransformation() const 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 setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) override; + virtual void setClip() override; + virtual ::basegfx::B2DPolyPolygon const* getClip() const override; - virtual ColorSharedPtr createColor() const SAL_OVERRIDE; + virtual ColorSharedPtr createColor() const override; - virtual CanvasSharedPtr clone() const SAL_OVERRIDE; + virtual CanvasSharedPtr clone() const override; - virtual void clear() const SAL_OVERRIDE; + virtual void clear() const override; virtual css::uno::Reference< - css::rendering::XCanvas > getUNOCanvas() const SAL_OVERRIDE; + css::rendering::XCanvas > getUNOCanvas() const override; - virtual css::rendering::ViewState getViewState() const SAL_OVERRIDE; + virtual css::rendering::ViewState getViewState() const 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 f6949b262e68..7f6409b291ff 100644 --- a/cppcanvas/source/wrapper/implcolor.hxx +++ b/cppcanvas/source/wrapper/implcolor.hxx @@ -37,7 +37,7 @@ namespace cppcanvas css::rendering::XGraphicDevice >& rDevice ); virtual ~ImplColor(); - virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE; + virtual css::uno::Sequence< double > getDeviceColor( IntSRGBA aSRGBA ) const override; private: css::uno::Reference< css::rendering::XGraphicDevice > mxDevice; diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx index fcf12d7eb5ee..785eb5cb3409 100644 --- a/cppcanvas/source/wrapper/implcustomsprite.hxx +++ b/cppcanvas/source/wrapper/implcustomsprite.hxx @@ -41,7 +41,7 @@ namespace cppcanvas const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); virtual ~ImplCustomSprite(); - virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE; + virtual CanvasSharedPtr getContentCanvas() const override; private: ImplCustomSprite(const ImplCustomSprite&) = delete; diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx index 4db158ac8eab..cfaed772696b 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.hxx +++ b/cppcanvas/source/wrapper/implpolypolygon.hxx @@ -48,17 +48,17 @@ namespace cppcanvas virtual ~ImplPolyPolygon(); - virtual void setRGBAFillColor( Color::IntSRGBA ) SAL_OVERRIDE; - virtual void setRGBALineColor( Color::IntSRGBA ) SAL_OVERRIDE; - virtual Color::IntSRGBA getRGBALineColor() const SAL_OVERRIDE; + virtual void setRGBAFillColor( Color::IntSRGBA ) override; + virtual void setRGBALineColor( Color::IntSRGBA ) override; + virtual Color::IntSRGBA getRGBALineColor() const override; - virtual void setStrokeWidth( const double& rStrokeWidth ) SAL_OVERRIDE; - virtual double getStrokeWidth() const SAL_OVERRIDE; + virtual void setStrokeWidth( const double& rStrokeWidth ) override; + virtual double getStrokeWidth() const override; - virtual bool draw() const SAL_OVERRIDE; + virtual bool draw() const override; virtual css::uno::Reference< - css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE; + css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const override; private: ImplPolyPolygon(const ImplPolyPolygon&) = delete; diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx index d06931592250..fdb0c06a9316 100644 --- a/cppcanvas/source/wrapper/implsprite.hxx +++ b/cppcanvas/source/wrapper/implsprite.hxx @@ -40,21 +40,21 @@ namespace cppcanvas const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ); virtual ~ImplSprite(); - 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 setAlpha( const double& rAlpha ) override; + virtual void movePixel( const ::basegfx::B2DPoint& rNewPos ) override; + virtual void move( const ::basegfx::B2DPoint& rNewPos ) override; + virtual void transform( const ::basegfx::B2DHomMatrix& rMatrix ) override; + virtual void setClipPixel( const ::basegfx::B2DPolyPolygon& rClipPoly ) override; + virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) override; + virtual void setClip() override; - virtual void show() SAL_OVERRIDE; - virtual void hide() SAL_OVERRIDE; + virtual void show() override; + virtual void hide() override; - virtual void setPriority( double fPriority ) SAL_OVERRIDE; + virtual void setPriority( double fPriority ) override; virtual css::uno::Reference< - css::rendering::XSprite > getUNOSprite() const SAL_OVERRIDE; + css::rendering::XSprite > getUNOSprite() const override; private: ImplSprite(const ImplSprite&) = delete; diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx index 3ba92ee69e74..4a5439699ef6 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.hxx +++ b/cppcanvas/source/wrapper/implspritecanvas.hxx @@ -39,16 +39,16 @@ namespace cppcanvas virtual ~ImplSpriteCanvas(); - virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override; - virtual bool updateScreen( bool bUpdateAll ) const SAL_OVERRIDE; + virtual bool updateScreen( bool bUpdateAll ) const override; - virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const SAL_OVERRIDE; + virtual CustomSpriteSharedPtr createCustomSprite( const ::basegfx::B2DSize& ) const override; - virtual CanvasSharedPtr clone() const SAL_OVERRIDE; + virtual CanvasSharedPtr clone() const override; virtual css::uno::Reference< - css::rendering::XSpriteCanvas > getUNOSpriteCanvas() const SAL_OVERRIDE; + css::rendering::XSpriteCanvas > getUNOSpriteCanvas() const override; /** This class passes the view transformation to child sprites |