Kaydet (Commit) 1145de86 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Winconsistent-missing-override

Change-Id: I41d1e0d5e6263255426efb011c7b4bb5ae6775b5
üst 0eb27ddf
...@@ -92,7 +92,7 @@ namespace dxcanvas ...@@ -92,7 +92,7 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase ) DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase )
// XServiceName // XServiceName
virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException); virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override;
private: private:
css::uno::Sequence< css::uno::Any > maArguments; css::uno::Sequence< css::uno::Any > maArguments;
...@@ -149,10 +149,10 @@ namespace dxcanvas ...@@ -149,10 +149,10 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase ) DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase )
// XServiceName // XServiceName
virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException); virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override;
// BitmapProvider // BitmapProvider
virtual IBitmapSharedPtr getBitmap() const; virtual IBitmapSharedPtr getBitmap() const override;
private: private:
css::uno::Sequence< css::uno::Any > maArguments; css::uno::Sequence< css::uno::Any > maArguments;
......
...@@ -70,15 +70,15 @@ namespace dxcanvas ...@@ -70,15 +70,15 @@ namespace dxcanvas
virtual void disposeThis() override; virtual void disposeThis() override;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) 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); 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); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override;
// BitmapProvider // 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 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) {} virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException) override {}
private: private:
/** MUST hold here, too, since CanvasHelper only contains a /** MUST hold here, too, since CanvasHelper only contains a
......
...@@ -112,12 +112,12 @@ namespace dxcanvas ...@@ -112,12 +112,12 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase )
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() 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 ); 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 ); virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override;
// Sprite // Sprite
virtual void redraw() const; virtual void redraw() const override;
private: private:
/** MUST hold here, too, since BitmapCanvasHelper only contains a /** MUST hold here, too, since BitmapCanvasHelper only contains a
......
...@@ -118,14 +118,14 @@ namespace dxcanvas ...@@ -118,14 +118,14 @@ namespace dxcanvas
DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase )
// XBufferController (partial) // XBufferController (partial)
virtual sal_Bool SAL_CALL showBuffer( 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); virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override;
// XSpriteCanvas (partial) // 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 // 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 /// Retrieve rendermodule object for this Canvas
const IDXRenderModuleSharedPtr& getRenderModule() const; const IDXRenderModuleSharedPtr& getRenderModule() const;
...@@ -134,7 +134,7 @@ namespace dxcanvas ...@@ -134,7 +134,7 @@ namespace dxcanvas
const DXSurfaceBitmapSharedPtr& getBackBuffer() const; const DXSurfaceBitmapSharedPtr& getBackBuffer() const;
// BitmapProvider // BitmapProvider
virtual IBitmapSharedPtr getBitmap() const; virtual IBitmapSharedPtr getBitmap() const override;
private: private:
css::uno::Sequence< css::uno::Any > maArguments; css::uno::Sequence< css::uno::Any > maArguments;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment