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 /include/canvas/base/bitmapcanvasbase.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/canvas/base/bitmapcanvasbase.hxx')
| -rw-r--r-- | include/canvas/base/bitmapcanvasbase.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx index 78859d398fd5..d618ca934e33 100644 --- a/include/canvas/base/bitmapcanvasbase.hxx +++ b/include/canvas/base/bitmapcanvasbase.hxx @@ -68,20 +68,20 @@ namespace canvas typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; // XBitmap - virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual ::com::sun::star::geometry::IntegerSize2D SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); return BaseType::maCanvasHelper.getSize(); } - virtual sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException) override { return sal_True; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize, - sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -108,7 +108,7 @@ namespace canvas const ::com::sun::star::geometry::RealRectangle2D& destRect, const ::com::sun::star::rendering::ViewState& destViewState, const ::com::sun::star::rendering::RenderState& destRenderState ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState, destRect, destViewState, destRenderState, |