[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-0' - vcl/win

[Tomaž Vajngerl]

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

New commits:
commit 10a2dd0ca46cf05234019d10d8eac19ebaca1b63
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue Jul 25 12:16:34 2017 +0200

    tdf#109281 add fallback to GDI back when we can't bind a DC
    
    Change-Id: Ideae3a5bcacfaadd2cb9d6b014a449d423d332dc
    Reviewed-on: https://gerrit.libreoffice.org/40399
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 0682c4d9c2ad..6f33aaba63e5 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -478,6 +478,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))