Kaydet (Commit) 2414270c authored tarafından Zolnai Tamás's avatar Zolnai Tamás Kaydeden (comit) Markus Mohrhard

Don't create an OpenGL window in case of normal charts.

Change-Id: Idb4506712d3902c12aa881a85ddf69a281edff82
üst 19cf361e
......@@ -49,7 +49,7 @@ ChartWindow::ChartWindow( ChartController* pController, Window* pParent, WinBits
: Window(pParent, nStyle)
, m_pWindowController( pController )
, m_bInPaint(false)
, m_pOpenGLWindow(new OpenGLWindow(this))
, m_pOpenGLWindow(getenv("CHART_DUMMY_FACTORY") ? new OpenGLWindow(this) : 0)
{
this->SetHelpId( HID_SCH_WIN_DOCUMENT );
this->SetMapMode( MapMode(MAP_100TH_MM) );
......@@ -60,11 +60,14 @@ ChartWindow::ChartWindow( ChartController* pController, Window* pParent, WinBits
if( pParent )
pParent->EnableRTL( false );// #i96215# necessary for a correct position of the context menu in rtl mode
m_pOpenGLWindow->Show();
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();
if( m_pOpenGLWindow )
{
m_pOpenGLWindow->Show();
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()
......@@ -150,7 +153,8 @@ void ChartWindow::Resize()
else
Window::Resize();
m_pOpenGLWindow->SetSizePixel(GetSizePixel());
if( m_pOpenGLWindow )
m_pOpenGLWindow->SetSizePixel(GetSizePixel());
}
void ChartWindow::Activate()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment