[Libreoffice-commits] core.git: chart2/source svx/source

[Tor Lillqvist]

 chart2/source/view/main/ChartView.cxx                   |    4 ++++
 svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx |    4 ++++
 2 files changed, 8 insertions(+)

New commits:
commit 95f4d0fed142171acba11a3a6feda4fd820e70cc
Author: Tor Lillqvist <t...@collabora.com>
Date:   Thu Apr 17 17:24:22 2014 +0300

    Try harder to bypass OpenGL 3D stuff on non-desktop for now
    
    At least while the OpenGL chart feature is a work in progress, and
    nobody is working on it for iOS or Android anyway.
    
    Change-Id: I9de5c6647e6db42b330e593089e296aa9a346afb

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 978ecef..c530354 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "ChartView.hxx"
 #include "chartview/DrawModelWrapper.hxx"
 #include "NumberFormatterWrapper.hxx"
@@ -2455,11 +2457,13 @@ void ChartView::createShapes()
     pShapeFactory->setPageSize(mxRootShape, aPageSize);
     pShapeFactory->clearPage(m_xDrawPage);
 
+#if HAVE_FEATURE_DESKTOP
     if(isReal3DChart())
     {
         createShapes3D();
         return;
     }
+#endif
 
     {
         SolarMutexGuard aSolarGuard;
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx 
b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
index 6062ab9..2f76985 100644
--- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <config_features.h>
+
 #include <svx/sdr/contact/viewobjectcontactofopenglobj.hxx>
 #include <svx/sdr/contact/viewcontactofopenglobj.hxx>
 
@@ -21,9 +23,11 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
     ObjectContact& rObjectContact, ViewContact& rViewContact )
     : ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
 {
+#if HAVE_FEATURE_DESKTOP
     OpenGLContext* pContext = 
static_cast<SdrOpenGLObj&>(static_cast<ViewContactOfSdrObj&>(rViewContact).GetSdrObject()).getOpenGLContext();
     if (pContext)
         pContext->init(getWindow());
+#endif
 }
 
 ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits