mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try harder to bypass OpenGL 3D stuff on non-desktop for now

Browse Source 
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
This commit is contained in:
Tor Lillqvist
2014-04-17 17:24:22 +03:00
parent 2a67712f5f
commit 95f4d0fed1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
chart2/source/view/main/ChartView.cxx
View File

@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <config_features.h>
#include "ChartView.hxx" #include "ChartView.hxx"
#include "chartview/DrawModelWrapper.hxx" #include "chartview/DrawModelWrapper.hxx"
#include "NumberFormatterWrapper.hxx" #include "NumberFormatterWrapper.hxx"
@@ -2455,11 +2457,13 @@ void ChartView::createShapes()
pShapeFactory->setPageSize(mxRootShape, aPageSize); pShapeFactory->setPageSize(mxRootShape, aPageSize);
pShapeFactory->clearPage(m_xDrawPage); pShapeFactory->clearPage(m_xDrawPage);
#if HAVE_FEATURE_DESKTOP
if(isReal3DChart()) if(isReal3DChart())
{ {
createShapes3D(); createShapes3D();
return; return;
} }
#endif
{ {
SolarMutexGuard aSolarGuard; SolarMutexGuard aSolarGuard;

4
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
View File

@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * 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/viewobjectcontactofopenglobj.hxx>
#include <svx/sdr/contact/viewcontactofopenglobj.hxx> #include <svx/sdr/contact/viewcontactofopenglobj.hxx>
@@ -21,9 +23,11 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
ObjectContact& rObjectContact, ViewContact& rViewContact ) ObjectContact& rObjectContact, ViewContact& rViewContact )
: ViewObjectContactOfSdrObj( rObjectContact, rViewContact ) : ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
{ {
#if HAVE_FEATURE_DESKTOP
OpenGLContext* pContext = static_cast<SdrOpenGLObj&>(static_cast<ViewContactOfSdrObj&>(rViewContact).GetSdrObject()).getOpenGLContext(); OpenGLContext* pContext = static_cast<SdrOpenGLObj&>(static_cast<ViewContactOfSdrObj&>(rViewContact).GetSdrObject()).getOpenGLContext();
if (pContext) if (pContext)
pContext->init(getWindow()); pContext->init(getWindow());
#endif
} }
ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj() ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()