diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-13 05:34:58 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-13 06:21:34 +0200 |
commit | db8c473cb73c6fc6aaf0e36e88e1b2ee000f4f6e (patch) | |
tree | 14f85680ed9fa1fc42693e7a0f7f265984e302ba /chart2 | |
parent | 0cb5939f72288d175f2977d4c832ab7ff1edbf18 (diff) |
fix warnings
Change-Id: Idced64d57ea850961d67e83e082b51dc9442cc0d
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/view/charttypes/GL3DBarChart.cxx | 7 | ||||
-rw-r--r-- | chart2/source/view/inc/GL3DBarChart.hxx | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 989342300c71..924c6d2ac1e5 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -409,12 +409,12 @@ GL3DBarChart::GL3DBarChart( maRenderEvent(EVENT_NONE), mSelectBarId(0), miScrollRate(0), - miFrameCount(0), - miDataUpdateCounter(0), mbScrollFlg(false), mbScreenTextNewRender(false), maFPS(OUString("Render FPS: 0")), - maDataUpdateFPS(OUString("Data Update FPS: 0")) + maDataUpdateFPS(OUString("Data Update FPS: 0")), + miFrameCount(0), + miDataUpdateCounter(0) { if (BENCH_MARK_MODE) { @@ -1062,7 +1062,6 @@ void GL3DBarChart::calcDistance(std::vector<sal_uInt32> & vectorNearest) vectorNearest.push_back(nId); i++; } - glm::vec3 distancePosition = it->second.maPos; maDistanceMap[nId] = calcScrollDistance(mvp, glm::vec3(it->second.maPos.x + BAR_SIZE_X / 2.0f, it->second.maPos.y + BAR_SIZE_Y / 2.0f, it->second.maPos.z)); diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index d8b88430ba54..f50895f9bd44 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -50,7 +50,6 @@ enum RenderEventType EVENT_DIE }; - class RenderThread; class RenderOneFrameThread; class RenderAnimationThread; |