make the chart patch warning free and more clean-up

Change-Id: I26ed3e89a77e4dcb68edea02e89fcc18197f2878

chart2/source/view/main/DummyXShape.cxx

@@ -1146,9 +1146,8 @@ void DummyXShapes::render()
 }
 
 DummyChart::DummyChart(uno::Reference< drawing::XShape > xTarget):
-    m_GLRender(),
-    maDrawPage(xTarget),
-    mbNotInit(true)
+    mbNotInit(true),
+    m_GLRender(xTarget)
 {
     SAL_INFO("chart2.opengl", "DummyXShape::DummyChart()-----test: ");
     setName("com.sun.star.chart2.shapes");
@@ -1190,12 +1189,7 @@ void DummyChart::render()
 #else
     DummyXShapes::render();
 #endif
-    Graphic aGraphic = m_GLRender.renderToBitmap();
-    uno::Reference< awt::XBitmap> xBmp( aGraphic.GetXGraphic(), uno::UNO_QUERY );
-    uno::Reference < beans::XPropertySet > xPropSet ( maDrawPage, uno::UNO_QUERY );
-    xPropSet->setPropertyValue("Graphic", uno::makeAny(aGraphic.GetXGraphic()));
-    maDrawPage->setSize(awt::Size(m_GLRender.m_iWidth*OPENGL_SCALE_VALUE, m_GLRender.m_iHeight*OPENGL_SCALE_VALUE));
-    maDrawPage->setPosition(awt::Point(0,0));
+    m_GLRender.renderToBitmap();
 }
 
 void DummyChart::clear()

chart2/source/view/main/DummyXShape.hxx

@@ -404,12 +404,11 @@ public:
 private:
 
     TextCache maTextCache;
-    com::sun::star::uno::Reference< com::sun::star::drawing::XShape > maDrawPage;
+    bool mbNotInit;
 
 public:
     OpenGLRender m_GLRender;
 
-    bool mbNotInit;
 };
 
 class DummyGroup2D : public DummyXShapes

chart2/source/view/main/OpenGLRender.hxx

@@ -178,7 +178,7 @@ struct PackedVertex{
 class OpenGLRender
 {
 public:
-    OpenGLRender();
+    OpenGLRender(com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xTarget);
     ~OpenGLRender();
     int InitOpenGL();
     int MoveModelf(PosVecf3 trans, PosVecf3 angle, PosVecf3 scale);
@@ -197,7 +197,7 @@ public:
     int RenderBubble2FBO(int wholeFlag);
 
     void prepareToRender();
-    Graphic renderToBitmap();
+    void renderToBitmap();
 
     int RenderRectangleShape(bool bBorder, bool bFill);
     int RectangleShapePoint(float x, float y, float directionX, float directionY);
@@ -239,44 +239,46 @@ public:
     void SetClickPos(Point aMPos);
     int RenderClickPos(Point aMPos);
 
-public:
+private:
+
+    com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxTarget;
         //for performance
 
-        double m_dFreq;
+    double m_dFreq;
 
-        float m_fProcessXShape;
+    float m_fProcessXShape;
 
-        float m_fReadPixel;
+    float m_fReadPixel;
 
-        float m_fProcess2DLine;
+    float m_fProcess2DLine;
 
-        float m_fSet2DLineProp;
+    float m_fSet2DLineProp;
 
-        float m_fRender2DLine;
+    float m_fRender2DLine;
 
-        float m_fProcess2DBubble;
+    float m_fProcess2DBubble;
 
-        float m_fRender2DBubble;
+    float m_fRender2DBubble;
 
-        float m_fSet2DBubbleProp;
+    float m_fSet2DBubbleProp;
 
-        float m_fProcessText;
+    float m_fProcessText;
 
-        float m_fSetTextProp;
+    float m_fSetTextProp;
 
-        float m_fRenderText;
+    float m_fRenderText;
 
-        float m_fProcessRect;
+    float m_fProcessRect;
 
-        float m_fSetRectProp;
+    float m_fSetRectProp;
 
-        float m_fRenderRect;
+    float m_fRenderRect;
 
-        float m_fInterationShapes;
+    float m_fInterationShapes;
 
-        int m_iWidth;
+    int m_iWidth;
 
-        int m_iHeight;
+    int m_iHeight;
 
 private:
     int CreateTextureObj(int width, int height);