[Libreoffice-commits] core.git: 2 commits - chart2/source

[Tor Lillqvist]

 chart2/source/view/inc/3DChartObjects.hxx |    2 +-
 chart2/source/view/inc/GL3DRenderer.hxx   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dbe06b114cc9097a5b7349652dc25c0d2c9c1c5e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon May 5 22:47:30 2014 +0300

    WaE: overriding virtual function declaration not marked 'override'
    
    Change-Id: I96e84e3ec756216fabe9739e6bd53d2a89d186b5

diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx
index b1f8de4..a6bf266 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -104,7 +104,7 @@ public:
     TemporaryContext();
 
     void init();
-    void render();
+    virtual void render() SAL_OVERRIDE;
 
 private:
     OpenGLContext maContext;
commit 6ca24c38cbc0c1df755e51e366c715d4fb4f1d93
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon May 5 22:45:33 2014 +0300

    WaE: overriding virtual function declaration not marked 'override'
    
    Change-Id: Ifd89b00c525ed4d75fcffe92845c4ca2f73705a8

diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx
index 5f66203..4782f50 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -160,7 +160,7 @@ public:
 
     void LoadShaders();
     void init();
-    bool isOpenGLInitialized();
+    virtual bool isOpenGLInitialized() SAL_OVERRIDE;
     void Set3DSenceInfo(sal_Int32 color = 255, bool twoSidesLighting = true);
     void SetLightInfo(bool lightOn, sal_Int32 color, const glm::vec4& direction);
     void AddShapePolygon3DObject(sal_Int32 color, bool lineOnly, sal_Int32 lineColor,