diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-06 12:26:11 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-06 20:45:13 +0200 |
| commit | ac6fabdc02fdcba8a502153099512946d2b7effd (patch) | |
| tree | 7f8bfb9b409ae0c732ca0ed6d9c3dbb30207e940 /chart2 | |
| parent | 8f38b9e11eef43fbc47827eff432b3620aeee2d4 (diff) | |
fix Wreorder
Change-Id: Icc9d9587ddf5610d6adaca9b2ea5eb32e2534947
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/view/inc/GL3DRenderer.hxx | 2 | ||||
| -rw-r--r-- | chart2/source/view/main/GL3DRenderer.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 1eed3cba48f9..b9af426680d2 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -180,8 +180,8 @@ public: RenderBenchMarkThread(GL3DBarChart * pChart): RenderThread(pChart), mbExecuting(false), - miFrameCount(0), - mbNeedFlyBack(false) + mbNeedFlyBack(false), + miFrameCount(0) { osl_getSystemTime(&mafpsRenderStartTime); osl_getSystemTime(&mafpsRenderEndTime); diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index c993ecdbb0f5..f4b4b6762167 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -464,9 +464,9 @@ private: sal_uInt32 m_uiSelectID; float m_fScrollSpeed; float m_fScrollDistance; - float m_fCurDistance; float m_fMinCoordX; float m_fMaxCoordX; + float m_fCurDistance; glm::mat4 m_ScrollMoveMatrix; bool m_bUndrawFlag; }; diff --git a/chart2/source/view/main/GL3DRenderer.cxx b/chart2/source/view/main/GL3DRenderer.cxx index 57f016b95f6b..48d7da7bc49e 100644 --- a/chart2/source/view/main/GL3DRenderer.cxx +++ b/chart2/source/view/main/GL3DRenderer.cxx @@ -114,8 +114,8 @@ OpenGL3DRenderer::OpenGL3DRenderer(): , m_fMinCoordX(0.0f) , m_fMaxCoordX(0.0f) , m_fCurDistance(0.0f) - , m_bUndrawFlag(false) , m_ScrollMoveMatrix(glm::mat4(1.0)) + , m_bUndrawFlag(false) { m_Polygon3DInfo.lineOnly = false; m_Polygon3DInfo.twoSidesLighting = false; @@ -162,6 +162,7 @@ OpenGL3DRenderer::~OpenGL3DRenderer() OpenGL3DRenderer::ShaderResources::ShaderResources() : m_b330Support(false) + , m_bScrollFlag(false) , m_3DProID(0) , m_3DProjectionID(0) , m_3DViewID(0) @@ -207,7 +208,6 @@ OpenGL3DRenderer::ShaderResources::ShaderResources() , m_BatchTextVertexID(0) , m_BatchTextTexCoordID(0) , m_BatchTextTexID(0) - , m_bScrollFlag(false) { } |