diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-05 22:40:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-06 08:42:55 +0000 |
| commit | d8a1059ef2270681861da183ce486b636c07a4b7 (patch) | |
| tree | e8efc3df30bd9fdba0d8d4439b321f45b65bfd92 /chart2/source/model | |
| parent | a6fd34907fa9d2eedcd6fba2bb4c1e3340d88fb1 (diff) | |
OpenGLWindow typeinfo unavailable without HAVE_FEATURE_OPENGL
Change-Id: Ie06c1121502db9b1a869f657f70d3b45db610e2f
Diffstat (limited to 'chart2/source/model')
| -rw-r--r-- | chart2/source/model/main/ChartModel.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index f7a19f16bf86..f76bb9faf2ff 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -107,8 +107,10 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY) , mnStart(0) , mnEnd(0) - ,bSet(false) + , bSet(false) +#if HAVE_FEATURE_OPENGL , mpOpenGLWindow(nullptr) +#endif { osl_atomic_increment(&m_refCount); { @@ -151,7 +153,9 @@ ChartModel::ChartModel( const ChartModel & rOther ) , mnStart(rOther.mnStart) , mnEnd(rOther.mnEnd) , bSet(false) +#if HAVE_FEATURE_OPENGL , mpOpenGLWindow(nullptr) +#endif { osl_atomic_increment(&m_refCount); { @@ -1350,8 +1354,12 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd) void ChartModel::setWindow( const sal_uInt64 nWindowPtr ) { +#if HAVE_FEATURE_OPENGL OpenGLWindow* pWindow = reinterpret_cast<OpenGLWindow*>(nWindowPtr); mpOpenGLWindow = pWindow; +#else + (void)nWindowPtr; +#endif } void ChartModel::update() @@ -1362,7 +1370,9 @@ void ChartModel::update() } mxChartView->setViewDirty(); mxChartView->update(); +#if HAVE_FEATURE_OPENGL mxChartView->updateOpenGLWindow(); +#endif } } // namespace chart |