diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-01-15 22:39:10 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-29 08:09:50 +0100 |
| commit | aaa92e1a374c55a8fd925afb62b55734388482cf (patch) | |
| tree | 5678f73514a49c6c6b49da2bf146c9d0fc63645b /chart2/source | |
| parent | 118154299c4d42e90a9a25905f13068a4b3bbd4e (diff) | |
no need for a member variable
Change-Id: I58b22d123e4ba0dddeef5054492a1f851447857b
Diffstat (limited to 'chart2/source')
| -rwxr-xr-x | chart2/source/view/main/OpenGLRender.cxx | 12 | ||||
| -rwxr-xr-x | chart2/source/view/main/OpenGLRender.hxx | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index a73b39ae53c8..77018c116703 100755 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -931,7 +931,6 @@ OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget): m_ClearColor(glm::vec4(1.0f, 1.0f, 1.0f, 1.0f)) { //TODO: moggi: use STL - memset(&m_Bubble2DPointList, 0, sizeof(m_Bubble2DPointList)); memset(&m_Bubble2DCircle, 0, sizeof(m_Bubble2DCircle)); memset(&m_TextInfo, 0, sizeof(TextInfo)); @@ -1266,12 +1265,13 @@ int OpenGLRender::Bubble2DShapePoint(float x, float y, float directionX, float d float actualX = (x / OPENGL_SCALE_VALUE); float actualY = (y / OPENGL_SCALE_VALUE); - m_Bubble2DPointList.x = actualX; - m_Bubble2DPointList.y = actualY; - m_Bubble2DPointList.xScale = directionX / OPENGL_SCALE_VALUE; - m_Bubble2DPointList.yScale = directionY / OPENGL_SCALE_VALUE; + Bubble2DPointList aBubble2DPointList; + aBubble2DPointList.x = actualX; + aBubble2DPointList.y = actualY; + aBubble2DPointList.xScale = directionX / OPENGL_SCALE_VALUE; + aBubble2DPointList.yScale = directionY / OPENGL_SCALE_VALUE; - m_Bubble2DShapePointList.push_back(m_Bubble2DPointList); + m_Bubble2DShapePointList.push_back(aBubble2DPointList); return 0; } diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 815d7d32394b..2e8e6e0d16a6 100755 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -263,8 +263,6 @@ private: Bubble2DCircle m_Bubble2DCircle; - Bubble2DPointList m_Bubble2DPointList; - std::list <Bubble2DPointList> m_Bubble2DShapePointList; GLint m_CommonProID; GLint m_2DVertexID; |