[Libreoffice-commits] core.git: vcl/osx

Julien Nabet serval2412 at yahoo.fr
Wed Oct 29 14:10:45 PDT 2014


 vcl/osx/salobj.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 354a5f1ab65a2d36cceb948331edd4578ac349c6
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Oct 29 22:09:20 2014 +0100

    Resolves fdo#85524: OSX Crash Impress with videoclip
    
    Change-Id: If222be9574af1078ffba15c07f048503dd8d7e8e

diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 7932f8a..58e2c64 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -38,7 +38,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWindowDat
 {
     maSysData.nSize = sizeof( maSysData );
     maSysData.mpNSView = NULL;
-    maSysData.mbOpenGL = pWindowData->bOpenGL;
+    maSysData.mbOpenGL = false;
 
     NSRect aInitFrame = { NSZeroPoint, { 20, 20 } };
     mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ];
@@ -49,6 +49,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame, SystemWindowData* pWindowDat
     }
     if (pWindowData && pWindowData->bOpenGL)
     {
+        maSysData.mbOpenGL = true;
         NSOpenGLPixelFormat* pixFormat = NULL;
 
         if (pWindowData->bLegacy)


More information about the Libreoffice-commits mailing list