remove some OpenGL traces from OpenGLRender and DummyXShape

Change-Id: Ibc4877a7c98a0ee1920d6ff0137009f489e2e9a9

4 files changed, 5 insertions, 25 deletions

diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index c3978f4484d9..5a0f88eaabb3 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1147,8 +1147,7 @@ DummyChart::DummyChart(uno::Reference< drawing::XShape > xTarget):
 {
     SAL_INFO("chart2.opengl", "DummyXShape::DummyChart()-----test: ");
     setName("com.sun.star.chart2.shapes");
-    m_aGLContext.init();
-    m_GLRender.InitOpenGL(m_aGLContext.getOpenGLWindow());
+    m_GLRender.InitOpenGL();
 }
 
 void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition )
@@ -1167,7 +1166,6 @@ void SAL_CALL DummyChart::setSize( const awt::Size& aSize )
     SAL_INFO("chart2.opengl", "DummyChart::setSize()---aSize.Width = " << aSize.Width << ", aSize.Height = " << aSize.Height);
     int width = aSize.Width / OPENGL_SCALE_VALUE;
     int height = aSize.Height / OPENGL_SCALE_VALUE;
-    m_aGLContext.setWinSize(Size(width, height));
     DummyXShape::setSize(awt::Size(0,0));
     m_GLRender.SetSize(width, height);
     SAL_INFO("chart2.opengl", "DummyChart::GLRender.Width = " << width << ", GLRender.Height = " << height);
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index 3ea60b43a598..81a088a52d6a 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -404,7 +404,6 @@ public:
 private:
 
     TextCache maTextCache;
-    OpenGLContext m_aGLContext;
 
 public:
     OpenGLRender m_GLRender;
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index a0f7573b2e78..610eb72184e4 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -232,10 +232,10 @@ GLfloat texCoords[] = {
 
 }
 
-int OpenGLRender::InitOpenGL(GLWindow aWindow)
+int OpenGLRender::InitOpenGL()
 {
-    glWin = aWindow;
-    mbArbMultisampleSupported = glWin.bMultiSampleSupported;
+    //TODO: moggi: get the information from the context
+    mbArbMultisampleSupported = true;
     if(!bGlewInit)
     {
         glewExperimental = GL_TRUE;
@@ -636,21 +636,6 @@ void OpenGLRender::Release()
     glDeleteRenderbuffers(1, &m_RboID);
     glDeleteRenderbuffers(1, &m_renderBufferColorMS);
     glDeleteRenderbuffers(1, &m_renderBufferDepthMS);
-#if defined( WNT )
-    wglMakeCurrent(NULL, NULL);
-#elif defined( MACOSX )
-
-#elif defined( UNX )
-
-    glXMakeCurrent(glWin.dpy, None, NULL);
-    if( glGetError() != GL_NO_ERROR ) {
-        SAL_INFO("chart2.opengl", "glError: " << (char *)gluErrorString(glGetError()));
-    }
-    glXDestroyContext(glWin.dpy, glWin.ctx);
-    glWin.ctx = NULL;
-    glWin.win = 0;
-
-#endif
 }
 
 OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget)
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 725e32ef2a15..6fde176d8910 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -67,7 +67,7 @@ public:
     OpenGLRender(com::sun::star::uno::Reference<
             com::sun::star::drawing::XShape > xTarget );
     ~OpenGLRender();
-    int InitOpenGL(GLWindow);
+    int InitOpenGL();
     int MoveModelf(PosVecf3 trans, PosVecf3 angle, PosVecf3 scale);
     void SetSize(int width, int height);
     void Release();
@@ -141,8 +141,6 @@ private:
 
     int m_iHeight;
 
-    GLWindow glWin;
-
     Line2DPointList m_Line2DPointList;
 
     float m_fLineWidth;