summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-04 20:53:06 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-04 20:53:06 +0100
commit148cde5f7daad47ae1df1f92f77dd16499c6ac75 (patch)
treed6d516d39ee32a7584f61a7f7774db317c4c05ea
parent6f46cf4fe112bc2aec29a8975ef10861853716b6 (diff)
-Werror,-Winconsistent-missing-override
(loplugin:saloverride does not warn about them because they depend on template args) Change-Id: I41a1dbfd7db24e58154f6f3810781219119418ba
-rw-r--r--extensions/source/dbpilots/unoautopilot.hxx2
-rw-r--r--include/canvas/base/canvascustomspritebase.hxx12
-rw-r--r--include/canvas/base/spritecanvasbase.hxx8
-rw-r--r--include/toolkit/awt/scrollabledialog.hxx2
4 files changed, 12 insertions, 12 deletions
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index 29b6b79b7dfb..d176321acacf 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -81,7 +81,7 @@ namespace dbp
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
// OPropertyArrayUsageHelper
- virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
+ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
protected:
// OGenericUnoDialog overridables
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 92fa61474ddc..b44808506e7f 100644
--- a/include/canvas/base/canvascustomspritebase.hxx
+++ b/include/canvas/base/canvascustomspritebase.hxx
@@ -219,42 +219,42 @@ namespace canvas
}
// Sprite
- virtual bool isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const
+ virtual bool isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return maSpriteHelper.isAreaUpdateOpaque( rUpdateArea );
}
- virtual bool isContentChanged() const
+ virtual bool isContentChanged() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return BaseType::mbSurfaceDirty;
}
- virtual ::basegfx::B2DPoint getPosPixel() const
+ virtual ::basegfx::B2DPoint getPosPixel() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return maSpriteHelper.getPosPixel();
}
- virtual ::basegfx::B2DVector getSizePixel() const
+ virtual ::basegfx::B2DVector getSizePixel() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return maSpriteHelper.getSizePixel();
}
- virtual ::basegfx::B2DRange getUpdateArea() const
+ virtual ::basegfx::B2DRange getUpdateArea() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return maSpriteHelper.getUpdateArea();
}
- virtual double getPriority() const
+ virtual double getPriority() const SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx
index 732098671705..a05f5266d1f3 100644
--- a/include/canvas/base/spritecanvasbase.hxx
+++ b/include/canvas/base/spritecanvasbase.hxx
@@ -142,7 +142,7 @@ namespace canvas
}
// SpriteSurface
- virtual void showSprite( const Sprite::Reference& rSprite )
+ virtual void showSprite( const Sprite::Reference& rSprite ) SAL_OVERRIDE
{
OSL_ASSERT( rSprite.is() );
@@ -151,7 +151,7 @@ namespace canvas
maRedrawManager.showSprite( rSprite );
}
- virtual void hideSprite( const Sprite::Reference& rSprite )
+ virtual void hideSprite( const Sprite::Reference& rSprite ) SAL_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 )
+ const ::basegfx::B2DVector& rSpriteSize ) SAL_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 )
+ const ::basegfx::B2DRange& rUpdateArea ) SAL_OVERRIDE
{
OSL_ASSERT( rSprite.is() );
diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx
index 0f2c93f2d590..e75fac70b0ed 100644
--- a/include/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
@@ -72,7 +72,7 @@ namespace toolkit
DECL_LINK( ScrollBarHdl, ScrollBar* );
virtual void ResetScrollBars();
// Window
- virtual void Resize();
+ virtual void Resize() SAL_OVERRIDE;
};
} // namespacetoolkit