From 70cc2b191b95fbc210bc1f0f6a7159f341894f0f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 26 Mar 2014 16:37:00 +0100 Subject: 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 --- canvas/source/cairo/cairo_canvasbitmap.hxx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'canvas/source/cairo/cairo_canvasbitmap.hxx') diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index 1f074cf0292a..4e2aae98a0c3 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -90,21 +90,21 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // SurfaceProvider - virtual SurfaceSharedPtr getSurface(); - virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, Content aContent = CAIRO_CONTENT_COLOR_ALPHA ); - virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ); - virtual SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ); - virtual OutputDevice* getOutputDevice(); + virtual SurfaceSharedPtr getSurface() SAL_OVERRIDE; + virtual SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, Content aContent = CAIRO_CONTENT_COLOR_ALPHA ) SAL_OVERRIDE; + virtual SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) SAL_OVERRIDE; + virtual SurfaceSharedPtr changeSurface( bool bHasAlpha, bool bCopyContent ) SAL_OVERRIDE; + virtual OutputDevice* getOutputDevice() SAL_OVERRIDE; // RepaintTarget virtual bool repaint( const SurfaceSharedPtr& pSurface, const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ); + const ::com::sun::star::rendering::RenderState& renderState ) SAL_OVERRIDE; // XFastPropertySet // used to retrieve BitmapEx pointer or X Pixmap handles for this bitmap @@ -116,8 +116,8 @@ namespace cairocanvas // 1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas // 2nd the pixmap handle // 3rd the pixmap depth - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException, std::exception) {} + virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE {} private: SurfaceProviderRef mpSurfaceProvider; -- cgit