[Libreoffice-commits] core.git: Branch 'feature/mac-opengl-fixes' - 2 commits - vcl/osx vcl/source

[Markus Mohrhard]

 vcl/osx/salobj.cxx              |    2 +-
 vcl/source/window/openglwin.cxx |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e010352a3d3f36ba2318c86fc9e389a32749e26f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 2 01:02:49 2014 +0200

    prevent potential crash if no SystemWindowData is passed
    
    Change-Id: I89f9a2d0993084abe9065b1c44ea5d97b5b7a7cc

diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 8cccd1b..7932f8a 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -47,7 +47,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWindowDat
         [mpFrame->getNSView() addSubview: mpClipView];
         [mpClipView setHidden: YES];
     }
-    if (pWindowData->bOpenGL)
+    if (pWindowData && pWindowData->bOpenGL)
     {
         NSOpenGLPixelFormat* pixFormat = NULL;
 
commit 01fe3faf09eed012f5db88f341c8d8195726eb22
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Tue Sep 2 01:01:37 2014 +0200

    fix crash when creating chart
    
    Change-Id: Ie6e38a0461a10cc33ff3d85cbf3b35ffab0efd59

diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx
index cfe6e6a..1151a4d 100644
--- a/vcl/source/window/openglwin.cxx
+++ b/vcl/source/window/openglwin.cxx
@@ -10,6 +10,7 @@
 #include <vcl/openglwin.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/event.hxx>
+#include <vcl/sysdata.hxx>
 
 class OpenGLWindowImpl
 {
@@ -21,9 +22,10 @@ private:
     boost::scoped_ptr<SystemChildWindow> mpChildWindow;
 };
 
-OpenGLWindowImpl::OpenGLWindowImpl(Window* pWindow):
-    mpChildWindow(new SystemChildWindow(pWindow))
+OpenGLWindowImpl::OpenGLWindowImpl(Window* pWindow)
 {
+    SystemWindowData aData = OpenGLContext::generateWinData(pWindow, false);
+    mpChildWindow.reset(new SystemChildWindow(pWindow, 0, &aData));
     mpChildWindow->Show();
     maContext.init(mpChildWindow.get());
     pWindow->SetMouseTransparent(false);