summaryrefslogtreecommitdiff
path: root/cppcanvas/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /cppcanvas/source
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'cppcanvas/source')
-rw-r--r--cppcanvas/source/inc/canvasgraphichelper.hxx8
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/bitmapaction.cxx10
-rw-r--r--cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx2
-rw-r--r--cppcanvas/source/mtfrenderer/lineaction.cxx10
-rw-r--r--cppcanvas/source/mtfrenderer/pointaction.cxx10
-rw-r--r--cppcanvas/source/mtfrenderer/polypolyaction.cxx30
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx58
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.cxx10
-rw-r--r--cppcanvas/source/uno/uno_mtfrenderer.hxx8
-rw-r--r--cppcanvas/source/wrapper/implbitmap.hxx8
-rw-r--r--cppcanvas/source/wrapper/implbitmapcanvas.hxx4
-rw-r--r--cppcanvas/source/wrapper/implcanvas.hxx20
-rw-r--r--cppcanvas/source/wrapper/implcolor.hxx2
-rw-r--r--cppcanvas/source/wrapper/implcustomsprite.hxx2
-rw-r--r--cppcanvas/source/wrapper/implpolypolygon.hxx14
-rw-r--r--cppcanvas/source/wrapper/implsprite.hxx22
-rw-r--r--cppcanvas/source/wrapper/implspritecanvas.hxx10
18 files changed, 117 insertions, 117 deletions
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index 26819ff5a087..076ce246b5e5 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -47,10 +47,10 @@ namespace cppcanvas
CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas );
// CanvasGraphic implementation
- virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE;
- virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) SAL_OVERRIDE;
- virtual void setClip() SAL_OVERRIDE;
- virtual void setCompositeOp( CompositeOp aOp ) SAL_OVERRIDE;
+ virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override;
+ virtual void setClip( const ::basegfx::B2DPolyPolygon& rClipPoly ) override;
+ virtual void setClip() override;
+ virtual void setCompositeOp( CompositeOp aOp ) override;
protected:
// for our clients
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 9347e3793a4b..f0fa80135b92 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -170,11 +170,11 @@ static float GetSwapFloat( SvStream& rSt )
virtual ~ImplRenderer();
- virtual bool draw() const SAL_OVERRIDE;
+ virtual bool draw() const override;
virtual bool drawSubset( sal_Int32 nStartIndex,
- sal_Int32 nEndIndex ) const SAL_OVERRIDE;
+ sal_Int32 nEndIndex ) const override;
virtual ::basegfx::B2DRange getSubsetArea( sal_Int32 nStartIndex,
- sal_Int32 nEndIndex ) const SAL_OVERRIDE;
+ sal_Int32 nEndIndex ) const 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 157a3c4a3cf1..b233d43328e1 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 SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const override;
uno::Reference< rendering::XBitmap > mxBitmap;
CanvasSharedPtr mpCanvas;
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 2b9a3645be93..fb69778b183b 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 SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
protected:
using Action::render;
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index a35eea36e2f5..abda71d5c2c7 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 SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
::basegfx::B2DPoint maStartPoint;
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index c73f7309662f..b8e37885c8da 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 SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
::basegfx::B2DPoint maPoint;
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index aab931606148..06bde882fb09 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 SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const 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 SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const 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 SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
using Action::render;
virtual bool renderPrimitive( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
- const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ const ::basegfx::B2DHomMatrix& rTransformation ) const 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 d744dd3f368c..41a53c48f815 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -629,15 +629,15 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
// TODO(P2): This is potentially a real mass object
@@ -795,19 +795,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
/// Interface TextRenderer
- virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const override;
// TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction),
@@ -1025,15 +1025,15 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
// TODO(P2): This is potentially a real mass object
@@ -1215,19 +1215,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const override;
// TODO(P2): This is potentially a real mass object
// (every character might be a separate TextAction),
@@ -1379,7 +1379,7 @@ namespace cppcanvas
}
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const override
{
mrCanvas->fillPolyPolygon( mrLinePolygon,
mrViewState,
@@ -1553,19 +1553,19 @@ namespace cppcanvas
const OutDevState& rState,
const ::basegfx::B2DHomMatrix& rTextTransform );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
// TextRenderer interface
- virtual bool operator()( const rendering::RenderState& rRenderState ) const SAL_OVERRIDE;
+ virtual bool operator()( const rendering::RenderState& rRenderState ) const 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 35fb98b11374..f516ee8ff419 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -97,15 +97,15 @@ namespace cppcanvas
const CanvasSharedPtr& rCanvas,
const OutDevState& rState );
- virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual bool renderSubset( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const SAL_OVERRIDE;
+ virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const override;
virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
- const Subset& rSubset ) const SAL_OVERRIDE;
+ const Subset& rSubset ) const override;
- virtual sal_Int32 getActionCount() const SAL_OVERRIDE;
+ virtual sal_Int32 getActionCount() const override;
private:
MtfAutoPtr mpGroupMtf;
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx
index a026a5095f30..c20a2486c449 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.hxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx
@@ -26,13 +26,13 @@ public:
css::uno::Reference<css::uno::XComponentContext> const&);
// XMtfRenderer iface
- void SAL_CALL setMetafile (const css::uno::Sequence< sal_Int8 >& rMtf) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- void SAL_CALL draw (double fScaleX, double fScaleY) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ void SAL_CALL setMetafile (const css::uno::Sequence< sal_Int8 >& rMtf) throw (css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL draw (double fScaleX, double fScaleY) throw (css::uno::RuntimeException, std::exception) override;
// XFastPropertySet
// setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering
- virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return css::uno::Any(); }
- virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) throw (css::uno::RuntimeException, std::exception) override { return css::uno::Any(); }
+ virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override;
private:
GDIMetaFile* mpMetafile;
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