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
This commit is contained in:
@@ -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;
|
||||
|
@@ -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()
|
||||
|
Reference in New Issue
Block a user