Kaydet (Commit) 4b60d33f authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Mark overriding CanvasCustomSpriteBase class template mem funs as SAL_OVERRIDE

Change-Id: I6c64d1b1caae27a1e1eac3a743aec078bc652d96
üst e40ceb81
...@@ -105,7 +105,7 @@ namespace canvas ...@@ -105,7 +105,7 @@ namespace canvas
} }
// XCanvas: selectively override base's methods here, for opacity tracking // XCanvas: selectively override base's methods here, for opacity tracking
virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException) virtual void SAL_CALL clear() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
...@@ -119,7 +119,7 @@ namespace canvas ...@@ -119,7 +119,7 @@ namespace canvas
drawBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >& xBitmap, 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::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
tools::verifyArgs(xBitmap, viewState, renderState, tools::verifyArgs(xBitmap, viewState, renderState,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -144,7 +144,7 @@ namespace canvas ...@@ -144,7 +144,7 @@ namespace canvas
// XSprite // XSprite
virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
tools::verifyRange( alpha, 0.0, 1.0 ); tools::verifyRange( alpha, 0.0, 1.0 );
...@@ -156,7 +156,7 @@ namespace canvas ...@@ -156,7 +156,7 @@ namespace canvas
virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos, virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos,
const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
tools::verifyArgs(aNewPos, viewState, renderState, tools::verifyArgs(aNewPos, viewState, renderState,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -168,7 +168,7 @@ namespace canvas ...@@ -168,7 +168,7 @@ namespace canvas
} }
virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
tools::verifyArgs(aTransformation, tools::verifyArgs(aTransformation,
BOOST_CURRENT_FUNCTION, BOOST_CURRENT_FUNCTION,
...@@ -179,7 +179,7 @@ namespace canvas ...@@ -179,7 +179,7 @@ namespace canvas
maSpriteHelper.transform( this, aTransformation ); 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) 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
{ {
// NULL xClip explicitly allowed here (to clear clipping) // NULL xClip explicitly allowed here (to clear clipping)
...@@ -188,21 +188,21 @@ namespace canvas ...@@ -188,21 +188,21 @@ namespace canvas
maSpriteHelper.clip( this, aClip ); maSpriteHelper.clip( this, aClip );
} }
virtual void SAL_CALL setPriority( double nPriority ) throw (::com::sun::star::uno::RuntimeException) virtual void SAL_CALL setPriority( double nPriority ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
maSpriteHelper.setPriority( this, nPriority ); maSpriteHelper.setPriority( this, nPriority );
} }
virtual void SAL_CALL show() throw (::com::sun::star::uno::RuntimeException) virtual void SAL_CALL show() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
maSpriteHelper.show( this ); maSpriteHelper.show( this );
} }
virtual void SAL_CALL hide() throw (::com::sun::star::uno::RuntimeException) virtual void SAL_CALL hide() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
...@@ -211,7 +211,7 @@ namespace canvas ...@@ -211,7 +211,7 @@ namespace canvas
// XCustomSprite // XCustomSprite
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL
getContentCanvas() throw (::com::sun::star::uno::RuntimeException) getContentCanvas() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{ {
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
......
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