vcl/source/outdev/text.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 392206f0449f9baa987d28cf509eccfa33700330
Author: Xisco Fauli <xiscofa...@libreoffice.org>
Date: Mon Feb 5 16:51:59 2018 +0100
tdf#112990: Hack-around: Do not crash on mac with opengl enabled
Change-Id: Id8d1ffe593fa42b7e37e26e8d66ffad87d6685c1
Reviewed-on: https://gerrit.libreoffice.org/49251
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Tamás Bunth <btom...@gmail.com>
(cherry picked from commit c83d2ac99dc3da4ef85b193543a93e02e3858844)
Reviewed-on: https://gerrit.libreoffice.org/49442
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 1d93f7730aae..5694a8165b58 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -32,6 +32,7 @@
#include <vcl/sysdata.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/controllayout.hxx>
+#include <vcl/opengl/OpenGLHelper.hxx>
#include <outdata.hxx>
#include <outdev.h>
@@ -861,6 +862,14 @@ void OutputDevice::DrawText( const Point& rStartPt, const
OUString& rStr,
if(mpFontInstance->mpConversion)
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
if(!pLayoutCache)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
