extensions/source/dbpilots/unoautopilot.hxx | 2 +- include/canvas/base/canvascustomspritebase.hxx | 12 ++++++------ include/canvas/base/spritecanvasbase.hxx | 8 ++++---- include/toolkit/awt/scrollabledialog.hxx | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 148cde5f7daad47ae1df1f92f77dd16499c6ac75 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Nov 4 20:53:06 2014 +0100 -Werror,-Winconsistent-missing-override (loplugin:saloverride does not warn about them because they depend on template args) Change-Id: I41a1dbfd7db24e58154f6f3810781219119418ba diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 29b6b79..d176321 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 92fa614..b448085 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 7320986..a05f526 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 0f2c93f..e75fac7 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits