diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-08 13:44:42 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-29 17:40:26 +0200 |
| commit | 7daba09d025a2ade10cecb33cd1d613f16b78fe4 (patch) | |
| tree | ecb7cc89f641f6d47293c3f0ff58a632f50a483f /chart2/source/controller/main/ChartWindow.cxx | |
| parent | 43d23a24fde16addb37376a92d36dba78263614a (diff) | |
Fix OpenGL chart reinitialiation
Problem after ChartWindow was disabled and enabled
again, OpenGL content was lost.
Two things:
-After setting a new OpenGLWindow the corresponding
IRenderer must be set (x3DWindowProvider->update)
-InitOpenGL() call should not depend on DummyChart, but on
OpenGLWindow (OpenGLContext).
Change-Id: If74e1945de9973d3921ceea1ca6fef39311add7a
Diffstat (limited to 'chart2/source/controller/main/ChartWindow.cxx')
| -rw-r--r-- | chart2/source/controller/main/ChartWindow.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 37335c4b87a2..40e69333c4f7 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -64,6 +64,7 @@ ChartWindow::ChartWindow( ChartController* pController, Window* pParent, WinBits uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(pController->getModel(), uno::UNO_QUERY_THROW); sal_uInt64 nWindowPtr = reinterpret_cast<sal_uInt64>(m_pOpenGLWindow); x3DWindowProvider->setWindow(nWindowPtr); + x3DWindowProvider->update(); } ChartWindow::~ChartWindow() @@ -72,6 +73,7 @@ ChartWindow::~ChartWindow() { uno::Reference< chart2::X3DChartWindowProvider > x3DWindowProvider(m_pWindowController->getModel(), uno::UNO_QUERY_THROW); x3DWindowProvider->setWindow(0); + x3DWindowProvider->update(); } delete m_pOpenGLWindow; } |