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

[Tomaž Vajngerl]

 vcl/win/gdi/DWriteTextRenderer.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit ead33392ddabe9655bc1edc050955429dff450f7
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Jul 25 12:26:03 2017 +0200

    tdf#109281 add fallback to GDI back when we can't bind a DC
    
    Change-Id: Ibaa0a86562cdeaff989c2a548efa03ea24933213
    Reviewed-on: https://gerrit.libreoffice.org/40398
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx
index 11469aadb597..1bd413375f5f 100755
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -259,6 +259,11 @@ bool D2DWriteTextOutRenderer::performRender(CommonSalLayout const & rLayout, Sal
         bRetry = true;
         return false;
     }
+    if (FAILED(hr))
+    {
+        // If for any reason we can't bind fallback to legacy APIs.
+        return ExTextOutRenderer()(rLayout, rGraphics, hDC);
+    }
 
     mlfEmHeight = 0;
     if (!GetDWriteFaceFromHDC(hDC, &mpFontFace, &mlfEmHeight))