summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-26 09:07:47 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-28 08:44:41 +0100
commit1145de8660691eb295a72fe8216092afdcde6d60 (patch)
treed5a425c363c888ef2cc7ccd3b0c67ce921951ff9 /canvas
parent0eb27ddf8138e6c91a33817ec938a64b05a4ce82 (diff)
-Werror,-Winconsistent-missing-override
Change-Id: I41d1e0d5e6263255426efb011c7b4bb5ae6775b5
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/directx/dx_canvas.hxx6
-rw-r--r--canvas/source/directx/dx_canvasbitmap.hxx12
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.hxx8
-rw-r--r--canvas/source/directx/dx_spritecanvas.hxx10
4 files changed, 18 insertions, 18 deletions
diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx
index 79ec10f8a0cc..e70992306bd4 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.hxx
@@ -92,7 +92,7 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase )
// XServiceName
- virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override;
private:
css::uno::Sequence< css::uno::Any > maArguments;
@@ -149,10 +149,10 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase )
// XServiceName
- virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override;
// BitmapProvider
- virtual IBitmapSharedPtr getBitmap() const;
+ virtual IBitmapSharedPtr getBitmap() const override;
private:
css::uno::Sequence< css::uno::Any > maArguments;
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
index d244bc8bb82b..53c8b2b7a7f0 100644
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.hxx
@@ -70,15 +70,15 @@ namespace dxcanvas
virtual void disposeThis() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException);
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
// BitmapProvider
- virtual IBitmapSharedPtr getBitmap() const { return mpBitmap; }
+ virtual IBitmapSharedPtr getBitmap() const override { return mpBitmap; }
- virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (css::uno::RuntimeException);
- virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException) {}
+ virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (css::uno::RuntimeException) override;
+ virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException) override {}
private:
/** MUST hold here, too, since CanvasHelper only contains a
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index 8136e9bfce1c..06e4b98fee98 100644
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -112,12 +112,12 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase )
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException );
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException );
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException );
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override;
// Sprite
- virtual void redraw() const;
+ virtual void redraw() const override;
private:
/** MUST hold here, too, since BitmapCanvasHelper only contains a
diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
index b3c2eefb7f6d..04471f8a509b 100644
--- a/canvas/source/directx/dx_spritecanvas.hxx
+++ b/canvas/source/directx/dx_spritecanvas.hxx
@@ -118,14 +118,14 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
// XBufferController (partial)
- virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException);
- virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
+ virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
// XSpriteCanvas (partial)
- virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
// XServiceName
- virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException);
+ virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override;
/// Retrieve rendermodule object for this Canvas
const IDXRenderModuleSharedPtr& getRenderModule() const;
@@ -134,7 +134,7 @@ namespace dxcanvas
const DXSurfaceBitmapSharedPtr& getBackBuffer() const;
// BitmapProvider
- virtual IBitmapSharedPtr getBitmap() const;
+ virtual IBitmapSharedPtr getBitmap() const override;
private:
css::uno::Sequence< css::uno::Any > maArguments;