Kaydet (Commit) c83d2ac9 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Miklos Vajna

tdf#112990: Hack-around: Do not crash on mac with opengl enabled

Change-Id: Id8d1ffe593fa42b7e37e26e8d66ffad87d6685c1
Reviewed-on: https://gerrit.libreoffice.org/49251Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTamás Bunth <btomi96@gmail.com>
üst f4e32af7
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <vcl/sysdata.hxx> #include <vcl/sysdata.hxx>
#include <vcl/unohelp.hxx> #include <vcl/unohelp.hxx>
#include <vcl/controllayout.hxx> #include <vcl/controllayout.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <outdata.hxx> #include <outdata.hxx>
#include <outdev.h> #include <outdev.h>
...@@ -863,6 +864,14 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, ...@@ -863,6 +864,14 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr,
if(mpFontInstance->mpConversion) if(mpFontInstance->mpConversion)
pLayoutCache = nullptr; pLayoutCache = nullptr;
#ifdef MACOSX
// FIXME: tdf#112990
// Cache text layout crashes on mac with OpenGL enabled
// Force it to not use the cache
if(OpenGLHelper::isVCLOpenGLEnabled())
pLayoutCache = nullptr;
#endif
// without cache // without cache
if(!pLayoutCache) if(!pLayoutCache)
{ {
......
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