[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 2 commits - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx       |    2 ++
 chart2/source/view/main/OpenglShapeFactory.cxx |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit ed62683f83b086f2f3bfeef6548b0546a031bf85
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Dec 28 13:27:41 2013 +0100

    now I can at least something on the screen
    
    Change-Id: Iececc07d84cd583b68231814353a357553eda604

diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 0ec9feb..27b1ca1 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -126,6 +126,7 @@ uno::Reference< drawing::XShapes > OpenglShapeFactory::getOrCreateChartRootShape
         xRet = new dummy::DummyChart();
         m_pChart = (void *)((dummy::DummyChart *)xRet);
 #endif
+        xDrawPage->add(xTarget);
         xDrawPage->add(pContainer);
     }
     return xRet;
commit d67a7c60cdd07bc2b35f4b88e53c22e1552413fd
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Dec 28 13:17:49 2013 +0100

    try to control size
    
    Change-Id: Ib588b28370bc7a680fa379d02d7669999e963bec

diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 2ff2017..d4de633 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -683,6 +683,8 @@ int OpenGLRender::RenderLine2FBO(int wholeFlag)
     uno::Reference< awt::XBitmap> xBmp( aGraphic.GetXGraphic(), uno::UNO_QUERY );
     uno::Reference < beans::XPropertySet > xPropSet ( mxRenderTarget, uno::UNO_QUERY );
     xPropSet->setPropertyValue("Graphic", uno::makeAny(aGraphic.GetXGraphic()));
+    mxRenderTarget->setSize(awt::Size(m_iWidth, m_iHeight));
+    mxRenderTarget->setPosition(awt::Point(0,0));
 
 #endif
     glBindFramebuffer(GL_FRAMEBUFFER, 0);