[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source

[Zolnai Tamás]

 chart2/source/view/main/ChartView.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit d572c50e8f3a41d0c2049f58924967d6f961f966
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Aug 25 19:55:03 2014 +0200

    Don't render with mp2DRenderer when we have 3D charts
    
    Change-Id: Icb224f2d3dd55580532b1c4c43781ad444e51a43

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 4c27195..5753cc8 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2707,15 +2707,18 @@ void ChartView::createShapes()
 
 void ChartView::render()
 {
-    AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);
-    OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
-    if(pWindow)
-        pWindow->setRenderer(mp2DRenderer.get());
-    bool bRender = pShapeFactory->preRender(pWindow);
-    if(bRender)
+    if(!isReal3DChart())
     {
-        pShapeFactory->render(mxRootShape, pWindow != mp2DRenderer->getOpenGLWindow());
-        pShapeFactory->postRender(pWindow);
+        AbstractShapeFactory* pShapeFactory = AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory);
+        OpenGLWindow* pWindow = mrChartModel.getOpenGLWindow();
+        if(pWindow)
+            pWindow->setRenderer(mp2DRenderer.get());
+        bool bRender = pShapeFactory->preRender(pWindow);
+        if(bRender)
+        {
+            pShapeFactory->render(mxRootShape, pWindow != mp2DRenderer->getOpenGLWindow());
+            pShapeFactory->postRender(pWindow);
+        }
     }
 }