[Libreoffice-commits] core.git: Branch 'feature/mac-opengl-fixes' - avmedia/source slideshow/source
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Mon Sep 1 15:30:52 PDT 2014
avmedia/source/viewer/mediawindow_impl.cxx | 2 +-
slideshow/source/engine/shapes/viewmediashape.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d5186c15d2faed2b446871a0866de3b85c706375
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Tue Sep 2 00:20:37 2014 +0200
fix build
Change-Id: I13c67763ec3cb940292199f3e9e0f3942446959f
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index b608b85..f4c8856 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 9ebc014..fd3c507 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 ) );
More information about the Libreoffice-commits
mailing list