diff options
Diffstat (limited to 'include/canvas/base')
| -rw-r--r-- | include/canvas/base/basemutexhelper.hxx | 2 | ||||
| -rw-r--r-- | include/canvas/base/bitmapcanvasbase.hxx | 8 | ||||
| -rw-r--r-- | include/canvas/base/bufferedgraphicdevicebase.hxx | 22 | ||||
| -rw-r--r-- | include/canvas/base/cachedprimitivebase.hxx | 10 | ||||
| -rw-r--r-- | include/canvas/base/canvasbase.hxx | 40 | ||||
| -rw-r--r-- | include/canvas/base/canvascustomspritebase.hxx | 34 | ||||
| -rw-r--r-- | include/canvas/base/disambiguationhelper.hxx | 4 | ||||
| -rw-r--r-- | include/canvas/base/graphicdevicebase.hxx | 50 | ||||
| -rw-r--r-- | include/canvas/base/integerbitmapbase.hxx | 10 | ||||
| -rw-r--r-- | include/canvas/base/spritecanvasbase.hxx | 18 |
10 files changed, 99 insertions, 99 deletions
diff --git a/include/canvas/base/basemutexhelper.hxx b/include/canvas/base/basemutexhelper.hxx index d780d54a95f0..d4291a3a0c62 100644 --- a/include/canvas/base/basemutexhelper.hxx +++ b/include/canvas/base/basemutexhelper.hxx @@ -56,7 +56,7 @@ namespace canvas mutable osl::Mutex m_aMutex; private: - virtual void SAL_CALL disposing() SAL_OVERRIDE + virtual void SAL_CALL disposing() override { disposeThis(); } }; } 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, diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx index c9aec5f29eee..96847626f9b2 100644 --- a/include/canvas/base/bufferedgraphicdevicebase.hxx +++ b/include/canvas/base/bufferedgraphicdevicebase.hxx @@ -93,34 +93,34 @@ namespace canvas } // XGraphicDevice - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBufferController > SAL_CALL getBufferController( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBufferController > SAL_CALL getBufferController( ) throw (::com::sun::star::uno::RuntimeException) override { return this; } // XBufferController virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyRange( nBuffers, (sal_Int32)1 ); return 1; } - virtual void SAL_CALL destroyBuffers( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL destroyBuffers( ) throw (::com::sun::star::uno::RuntimeException) override { } virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { MutexType aGuard( BaseType::m_aMutex ); return BaseType::maDeviceHelper.showBuffer( mbIsVisible, bUpdateAll ); } - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { MutexType aGuard( BaseType::m_aMutex ); @@ -170,7 +170,7 @@ namespace canvas return ::com::sun::star::uno::makeAny(mxWindow); } - virtual void disposeThis() SAL_OVERRIDE + virtual void disposeThis() override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -218,7 +218,7 @@ namespace canvas } // XWindowListener - virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void disposeEventSource( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -228,24 +228,24 @@ namespace canvas BaseType::disposeEventSource(Source); } - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException) override { boundsChanged( e ); } - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& e ) throw (::com::sun::star::uno::RuntimeException) override { boundsChanged( e ); } - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); mbIsVisible = true; } - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx index 32e5ecde4ffa..9892aa6ffe1c 100644 --- a/include/canvas/base/cachedprimitivebase.hxx +++ b/include/canvas/base/cachedprimitivebase.hxx @@ -66,15 +66,15 @@ namespace canvas bool bFailForChangedViewTransform ); /// Dispose all internal references - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XCachedPrimitive - virtual ::sal_Int8 SAL_CALL redraw( const ::com::sun::star::rendering::ViewState& aState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int8 SAL_CALL redraw( const ::com::sun::star::rendering::ViewState& aState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo - 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; + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; protected: virtual ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves. diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 2cb129d90bc1..9f769f7b30f3 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -111,7 +111,7 @@ namespace canvas { } - virtual void disposeThis() SAL_OVERRIDE + virtual void disposeThis() override { MutexType aGuard( BaseType::m_aMutex ); @@ -122,7 +122,7 @@ namespace canvas } // XCanvas - virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException, std::exception) override { MutexType aGuard( BaseType::m_aMutex ); @@ -136,7 +136,7 @@ namespace canvas const css::rendering::RenderState& renderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(aPoint, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -153,7 +153,7 @@ namespace canvas const css::rendering::RenderState& renderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -172,7 +172,7 @@ namespace canvas const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -191,7 +191,7 @@ namespace canvas const css::rendering::RenderState& renderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -211,7 +211,7 @@ namespace canvas const css::rendering::StrokeAttributes& strokeAttributes) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, BOOST_CURRENT_FUNCTION, @@ -230,7 +230,7 @@ namespace canvas const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, BOOST_CURRENT_FUNCTION, @@ -250,7 +250,7 @@ namespace canvas const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping, const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, BOOST_CURRENT_FUNCTION, @@ -268,7 +268,7 @@ namespace canvas const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::rendering::StrokeAttributes& strokeAttributes ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, BOOST_CURRENT_FUNCTION, @@ -287,7 +287,7 @@ namespace canvas const css::rendering::RenderState& renderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -307,7 +307,7 @@ namespace canvas const css::uno::Sequence< ::com::sun::star::rendering::Texture >& textures) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, BOOST_CURRENT_FUNCTION, @@ -325,7 +325,7 @@ namespace canvas const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState, const ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::Texture >& textures, - const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + const ::com::sun::star::uno::Reference< ::com::sun::star::geometry::XMapping2D >& xMapping ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, BOOST_CURRENT_FUNCTION, @@ -343,7 +343,7 @@ namespace canvas createFont( const ::com::sun::star::rendering::FontRequest& fontRequest, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& extraFontProperties, const ::com::sun::star::geometry::Matrix2D& fontMatrix ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(fontRequest, // dummy, to keep argPos in sync @@ -361,7 +361,7 @@ namespace canvas virtual ::com::sun::star::uno::Sequence< ::com::sun::star::rendering::FontInfo > SAL_CALL queryAvailableFonts( const ::com::sun::star::rendering::FontInfo& aFilter, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aFontProperties ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(aFilter, BOOST_CURRENT_FUNCTION, @@ -381,7 +381,7 @@ namespace canvas sal_Int8 textDirection) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(xFont, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -404,7 +404,7 @@ namespace canvas const css::rendering::RenderState& renderState) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyArgs(laidOutText, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -421,7 +421,7 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(xBitmap, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -437,7 +437,7 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCachedPrimitive > SAL_CALL drawBitmapModulated( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(xBitmap, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -451,7 +451,7 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > SAL_CALL - getDevice() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + getDevice() throw (::com::sun::star::uno::RuntimeException) override { MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx index 51b582169a57..a3deacd64027 100644 --- a/include/canvas/base/canvascustomspritebase.hxx +++ b/include/canvas/base/canvascustomspritebase.hxx @@ -94,7 +94,7 @@ namespace canvas @derive when overriding this method in derived classes, <em>always</em> call the base class' method! */ - virtual void disposeThis() SAL_OVERRIDE + virtual void disposeThis() override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -105,7 +105,7 @@ namespace canvas } // XCanvas: selectively override base's methods here, for opacity tracking - virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException, std::exception) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -119,7 +119,7 @@ namespace canvas drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(xBitmap, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -144,7 +144,7 @@ namespace canvas // XSprite virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyRange( alpha, 0.0, 1.0 ); @@ -156,7 +156,7 @@ namespace canvas virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(aNewPos, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -168,7 +168,7 @@ namespace canvas } virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(aTransformation, BOOST_CURRENT_FUNCTION, @@ -179,7 +179,7 @@ namespace canvas maSpriteHelper.transform( this, aTransformation ); } - virtual void SAL_CALL clip( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL clip( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ) throw (::com::sun::star::uno::RuntimeException) override { // NULL xClip explicitly allowed here (to clear clipping) @@ -188,21 +188,21 @@ namespace canvas maSpriteHelper.clip( this, aClip ); } - virtual void SAL_CALL setPriority( double nPriority ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL setPriority( double nPriority ) throw (::com::sun::star::uno::RuntimeException) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); maSpriteHelper.setPriority( this, nPriority ); } - virtual void SAL_CALL show() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL show() throw (::com::sun::star::uno::RuntimeException) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); maSpriteHelper.show( this ); } - virtual void SAL_CALL hide() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL hide() throw (::com::sun::star::uno::RuntimeException) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -211,7 +211,7 @@ namespace canvas // XCustomSprite virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL - getContentCanvas() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + getContentCanvas() throw (::com::sun::star::uno::RuntimeException) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -219,42 +219,42 @@ namespace canvas } // Sprite - virtual bool isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const SAL_OVERRIDE + virtual bool isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); return maSpriteHelper.isAreaUpdateOpaque( rUpdateArea ); } - virtual bool isContentChanged() const SAL_OVERRIDE + virtual bool isContentChanged() const override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); return BaseType::mbSurfaceDirty; } - virtual ::basegfx::B2DPoint getPosPixel() const SAL_OVERRIDE + virtual ::basegfx::B2DPoint getPosPixel() const override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); return maSpriteHelper.getPosPixel(); } - virtual ::basegfx::B2DVector getSizePixel() const SAL_OVERRIDE + virtual ::basegfx::B2DVector getSizePixel() const override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); return maSpriteHelper.getSizePixel(); } - virtual ::basegfx::B2DRange getUpdateArea() const SAL_OVERRIDE + virtual ::basegfx::B2DRange getUpdateArea() const override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); return maSpriteHelper.getUpdateArea(); } - virtual double getPriority() const SAL_OVERRIDE + virtual double getPriority() const override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx index 9b07498cb754..45e2028024b3 100644 --- a/include/canvas/base/disambiguationhelper.hxx +++ b/include/canvas/base/disambiguationhelper.hxx @@ -66,10 +66,10 @@ namespace canvas mutable ::osl::Mutex m_aMutex; private: - virtual void SAL_CALL disposing() SAL_OVERRIDE + virtual void SAL_CALL disposing() override { disposeThis(); } - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) override { disposeEventSource(Source); } }; diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index 9e34eab460ae..a6db3160ea66 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/include/canvas/base/graphicdevicebase.hxx @@ -130,7 +130,7 @@ namespace canvas [this] (css::uno::Any const& rAny) { this->setDumpScreenContent(rAny); })); } - virtual void disposeThis() SAL_OVERRIDE + virtual void disposeThis() override { MutexType aGuard( BaseType::m_aMutex ); @@ -141,40 +141,40 @@ namespace canvas } // XGraphicDevice - virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController( ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController( ) throw (css::uno::RuntimeException) override { return css::uno::Reference< css::rendering::XBufferController >(); } - virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getDeviceColorSpace( ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getDeviceColorSpace( ) throw (css::uno::RuntimeException) override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.getColorSpace(); } - virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution() throw (css::uno::RuntimeException, std::exception) override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.getPhysicalResolution(); } - virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize() throw (css::uno::RuntimeException, std::exception) override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.getPhysicalSize(); } - virtual css::uno::Reference< css::rendering::XLinePolyPolygon2D > SAL_CALL createCompatibleLinePolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Reference< css::rendering::XLinePolyPolygon2D > SAL_CALL createCompatibleLinePolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points ) throw (css::uno::RuntimeException) override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.createCompatibleLinePolyPolygon( this, points ); } - virtual css::uno::Reference< css::rendering::XBezierPolyPolygon2D > SAL_CALL createCompatibleBezierPolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Reference< css::rendering::XBezierPolyPolygon2D > SAL_CALL createCompatibleBezierPolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points ) throw (css::uno::RuntimeException) override { MutexType aGuard( BaseType::m_aMutex ); @@ -184,7 +184,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyBitmapSize(size, BOOST_CURRENT_FUNCTION, @@ -196,7 +196,7 @@ namespace canvas } virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) SAL_OVERRIDE + css::uno::RuntimeException) override { tools::verifyBitmapSize(size, BOOST_CURRENT_FUNCTION, @@ -210,7 +210,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { tools::verifyBitmapSize(size, BOOST_CURRENT_FUNCTION, @@ -222,7 +222,7 @@ namespace canvas } virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) SAL_OVERRIDE + css::uno::RuntimeException) override { tools::verifyBitmapSize(size, BOOST_CURRENT_FUNCTION, @@ -233,23 +233,23 @@ namespace canvas return maDeviceHelper.createVolatileAlphaBitmap( this, size ); } - virtual css::uno::Reference< css::lang::XMultiServiceFactory > SAL_CALL getParametricPolyPolygonFactory( ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Reference< css::lang::XMultiServiceFactory > SAL_CALL getParametricPolyPolygonFactory( ) throw (css::uno::RuntimeException) override { return this; } - virtual sal_Bool SAL_CALL hasFullScreenMode( ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasFullScreenMode( ) throw (css::uno::RuntimeException) override { return sal_False; } - virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool ) throw (css::uno::RuntimeException) override { return false; } // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException) override { return css::uno::Reference< css::rendering::XParametricPolyPolygon2D >( ParametricPolyPolygon::create(this, @@ -257,7 +257,7 @@ namespace canvas css::uno::Sequence< css::uno::Any >())); } - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& aServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& aServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException) override { return css::uno::Reference< css::rendering::XParametricPolyPolygon2D >( ParametricPolyPolygon::create(this, @@ -265,14 +265,14 @@ namespace canvas Arguments)); } - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException) override { return ParametricPolyPolygon::getAvailableServiceNames(); } // XUpdatable - virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override { MutexType aGuard( BaseType::m_aMutex ); @@ -282,7 +282,7 @@ namespace canvas // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException) SAL_OVERRIDE + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException) override { MutexType aGuard( BaseType::m_aMutex ); return maPropHelper.getPropertySetInfo(); @@ -294,7 +294,7 @@ namespace canvas css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { MutexType aGuard( BaseType::m_aMutex ); maPropHelper.setPropertyValue( aPropertyName, aValue ); @@ -303,7 +303,7 @@ namespace canvas virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, - std::exception) SAL_OVERRIDE + std::exception) override { MutexType aGuard( BaseType::m_aMutex ); return maPropHelper.getPropertyValue( aPropertyName ); @@ -312,7 +312,7 @@ namespace canvas virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE + css::uno::RuntimeException) override { MutexType aGuard( BaseType::m_aMutex ); maPropHelper.addPropertyChangeListener( aPropertyName, @@ -322,14 +322,14 @@ namespace canvas virtual void SAL_CALL removePropertyChangeListener( const OUString& , const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE + css::uno::RuntimeException) override { } virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE + css::uno::RuntimeException) override { MutexType aGuard( BaseType::m_aMutex ); maPropHelper.addVetoableChangeListener( aPropertyName, @@ -339,7 +339,7 @@ namespace canvas virtual void SAL_CALL removeVetoableChangeListener( const OUString& , const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) SAL_OVERRIDE + css::uno::RuntimeException) override { } diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx index 54956b37be5f..57203b4b13e5 100644 --- a/include/canvas/base/integerbitmapbase.hxx +++ b/include/canvas/base/integerbitmapbase.hxx @@ -42,7 +42,7 @@ namespace canvas public: // XIntegerBitmap virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) override { tools::verifyArgs(rect, BOOST_CURRENT_FUNCTION, @@ -57,7 +57,7 @@ namespace canvas virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&, const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override { tools::verifyArgs(bitmapLayout, rect, BOOST_CURRENT_FUNCTION, @@ -71,7 +71,7 @@ namespace canvas virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&, const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override { tools::verifyArgs(bitmapLayout, pos, BOOST_CURRENT_FUNCTION, @@ -84,7 +84,7 @@ namespace canvas } virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, - const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) override { tools::verifyArgs(pos, BOOST_CURRENT_FUNCTION, @@ -97,7 +97,7 @@ namespace canvas pos ); } - virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException) override { typename Base::MutexType aGuard( Base::m_aMutex ); diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx index a05f5266d1f3..2ec26558f744 100644 --- a/include/canvas/base/spritecanvasbase.hxx +++ b/include/canvas/base/spritecanvasbase.hxx @@ -77,7 +77,7 @@ namespace canvas { } - virtual void disposeThis() SAL_OVERRIDE + virtual void disposeThis() override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -89,7 +89,7 @@ namespace canvas // XSpriteCanvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(animation, BOOST_CURRENT_FUNCTION, @@ -103,7 +103,7 @@ namespace canvas virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps, sal_Int8 interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::rendering::VolatileContentDestroyedException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(animationBitmaps, BOOST_CURRENT_FUNCTION, @@ -118,7 +118,7 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifySpriteSize(spriteSize, BOOST_CURRENT_FUNCTION, @@ -130,7 +130,7 @@ namespace canvas } virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE + ::com::sun::star::uno::RuntimeException) override { tools::verifyArgs(original, BOOST_CURRENT_FUNCTION, @@ -142,7 +142,7 @@ namespace canvas } // SpriteSurface - virtual void showSprite( const Sprite::Reference& rSprite ) SAL_OVERRIDE + virtual void showSprite( const Sprite::Reference& rSprite ) override { OSL_ASSERT( rSprite.is() ); @@ -151,7 +151,7 @@ namespace canvas maRedrawManager.showSprite( rSprite ); } - virtual void hideSprite( const Sprite::Reference& rSprite ) SAL_OVERRIDE + virtual void hideSprite( const Sprite::Reference& rSprite ) override { OSL_ASSERT( rSprite.is() ); @@ -163,7 +163,7 @@ namespace canvas virtual void moveSprite( const Sprite::Reference& rSprite, const ::basegfx::B2DPoint& rOldPos, const ::basegfx::B2DPoint& rNewPos, - const ::basegfx::B2DVector& rSpriteSize ) SAL_OVERRIDE + const ::basegfx::B2DVector& rSpriteSize ) override { OSL_ASSERT( rSprite.is() ); @@ -174,7 +174,7 @@ namespace canvas virtual void updateSprite( const Sprite::Reference& rSprite, const ::basegfx::B2DPoint& rPos, - const ::basegfx::B2DRange& rUpdateArea ) SAL_OVERRIDE + const ::basegfx::B2DRange& rUpdateArea ) override { OSL_ASSERT( rSprite.is() ); |