summaryrefslogtreecommitdiff
path: root/include/canvas/base/canvasbase.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'include/canvas/base/canvasbase.hxx')
-rw-r--r--include/canvas/base/canvasbase.hxx40
1 files changed, 20 insertions, 20 deletions
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 );