[Libreoffice-commits] core.git: vcl/headless vcl/opengl

Tor Lillqvist tml at collabora.com
Mon May 23 05:37:15 UTC 2016


 vcl/headless/svpinst.cxx   |    4 ++--
 vcl/opengl/x11/gdiimpl.cxx |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c30ab370d7f574a1993e8770c9589296cbd54118
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon May 23 08:21:57 2016 +0300

    loplugin:override
    
    Change-Id: Id782278645789d0b252ba3c096ca9e5538a3e5b3

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index c3aad03..a6b554c 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -449,8 +449,8 @@ class SvpOpenGLContext : public OpenGLContext
 {
     GLWindow m_aGLWin;
 private:
-    virtual const GLWindow& getOpenGLWindow() const { return m_aGLWin; }
-    virtual GLWindow& getModifiableOpenGLWindow() { return m_aGLWin; }
+    virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
+    virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
 };
 
 OpenGLContext* SvpSalInstance::CreateOpenGLContext()
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index a4b2a8c..00ab62d 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -40,8 +40,8 @@ public:
     virtual bool initWindow() override;
 private:
     GLX11Window m_aGLWin;
-    virtual const GLWindow& getOpenGLWindow() const { return m_aGLWin; }
-    virtual GLWindow& getModifiableOpenGLWindow() { return m_aGLWin; }
+    virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
+    virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
     virtual bool ImplInit() override;
     void initGLWindow(Visual* pVisual);
     virtual SystemWindowData generateWinData(vcl::Window* pParent, bool bRequestLegacyContext) override;


More information about the Libreoffice-commits mailing list