diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-09-02 00:20:37 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-09-02 01:08:55 +0200 |
| commit | 1ba10b7b307ffdb098049c303719da4aa6752502 (patch) | |
| tree | 68736aa4fabed4785fe95ce2cc1bd33386f73f65 | |
| parent | dee6c7ca318b310996ecc997cd64be026c0f76d2 (diff) | |
fix build
Change-Id: I13c67763ec3cb940292199f3e9e0f3942446959f
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 2 | ||||
| -rw-r--r-- | vcl/osx/salobj.cxx | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index b608b85928cc..f4c88561f426 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -515,7 +515,7 @@ void MediaWindowImpl::onURLChanged() #if HAVE_FEATURE_GLTF else if ( m_sMimeType == AVMEDIA_MIMETYPE_JSON ) { - SystemWindowData aWinData = OpenGLContext::generateWinData(this); + SystemWindowData aWinData = OpenGLContext::generateWinData(this, false); mpChildWindow.reset(new MediaChildWindow(this,&aWinData)); mbEventTransparent = false; } diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 9ebc0149456c..fd3c507365b3 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -477,7 +477,7 @@ namespace slideshow Size( aAWTRect.Width, aAWTRect.Height ) ); mpEventHandlerParent->EnablePaint(false); mpEventHandlerParent->Show(); - SystemWindowData aWinData = OpenGLContext::generateWinData(mpEventHandlerParent.get()); + SystemWindowData aWinData = OpenGLContext::generateWinData(mpEventHandlerParent.get(), false); mpMediaWindow.reset(new SystemChildWindow(mpEventHandlerParent.get(), 0, &aWinData)); mpMediaWindow->SetPosSizePixel( Point( 0, 0 ), Size( aAWTRect.Width, aAWTRect.Height ) ); diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx index 8cccd1be4af6..816eaf10e9bb 100644 --- a/vcl/osx/salobj.cxx +++ b/vcl/osx/salobj.cxx @@ -87,8 +87,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWindowDat { maSysData.mpNSView = [[NSView alloc] initWithFrame: aInitFrame]; } - - if( maSysData.mpNSView ) + if( maSysData.mpNSView ) { if( mpClipView ) [mpClipView setDocumentView: maSysData.mpNSView]; |