[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - include/vcl

[Stephan Bergmann]

 include/vcl/idle.hxx   |    2 +-
 include/vcl/scrbar.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6a43628ab4bfc2a4702e36812b4bd3dc51717813
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 20 13:51:25 2015 +0200

    -Werror,-Winconsistent-missing-override
    
    Change-Id: Ifc2e1159744dcaf5e7b0249ad00610e41cfe4fca
    (cherry picked from commit e854ed8ea85fb48f5a049dfc6a87309ff9c7c2ca)

diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index bbe334b..0bc0d22 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -153,7 +153,7 @@ private:
     using Window::ImplInit;
     SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 
-    virtual void ApplySettings(vcl::RenderContext& rRenderContext);
+    virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
 
 public:
     explicit        ScrollBarBox( vcl::Window* pParent, WinBits nStyle = 0 );
commit 01f8e9972e4ede318dfd8a7341aade34508c8ac7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 10 18:32:58 2015 +0200

    -Werror,-Winconsistent-missing-override
    
    Change-Id: I2d1aa79a67bf130c3844b3bccb34a1761e8e4dfc
    (cherry picked from commit 2ed0de57db80eae4fef8b226d956e012370fec15)

diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx
index 258fd48..2e853b7 100644
--- a/include/vcl/idle.hxx
+++ b/include/vcl/idle.hxx
@@ -32,7 +32,7 @@ public:
     Idle( const sal_Char *pDebugName = NULL );
     Idle( const Idle& rIdle );
 
-    virtual void    Start();
+    virtual void    Start() SAL_OVERRIDE;
 
     /// Make it possible to associate a callback with this idle handler
     /// of course, you can also sub-class and override 'Invoke'