Kaydet (Commit) d48f90dd authored tarafından Markus Mohrhard's avatar Markus Mohrhard

make the chart patch warning free and more clean-up

Change-Id: I26ed3e89a77e4dcb68edea02e89fcc18197f2878
üst f1d5c278
......@@ -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()
......
......@@ -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
......
......@@ -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,7 +239,9 @@ 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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment