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

[Marco Cecchetti]

 vcl/win/gdi/winlayout.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 92e33ae10d63b5acd8643d33c032dbb022bd75be
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Thu Apr 7 12:10:29 2016 +0200

    tdf#98710 - catch exception due to crash in dwrite
    
    Change-Id: I448b166866710825d2b3c582796c392436fe072e
    Reviewed-on: https://gerrit.libreoffice.org/23892
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 12df505..1ee9d02 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -4002,7 +4002,16 @@ bool D2DWriteTextOutRenderer::DrawGlyphs(const Point & origin, uint16_t * pGid,
 
 bool D2DWriteTextOutRenderer::GetDWriteFaceFromHDC(HDC hDC, IDWriteFontFace ** ppFontFace, float * lfSize) const
 {
-    bool const succeeded = SUCCEEDED(mpGdiInterop->CreateFontFaceFromHdc(hDC, ppFontFace));
+    bool succeeded = false;
+    try
+    {
+        succeeded = SUCCEEDED(mpGdiInterop->CreateFontFaceFromHdc(hDC, ppFontFace));
+    }
+    catch (const std::exception& e)
+    {
+        SAL_WARN("vcl.gdi.opengl", "Error in dwrite while creating font face: " << e.what());
+        return false;
+    }
 
     if (succeeded)
     {