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

[Xisco Fauli]

 vcl/win/gdi/winlayout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ed67ed55ad929eb9363a5c4e3c55b3ee857d984
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu Sep 28 12:05:13 2017 +0200

    tdf#112486 Do not force GDI in no OpenGL
    
    See:
    http://nabble.documentfoundation.org/Re-Minutes-of-ESC-call-2017-09-21-tt4223238.html
    
    Change-Id: I19bb4b58d2260fd23c32a687a9f504540c229985
    Reviewed-on: https://gerrit.libreoffice.org/42898
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 5440837e02dee8bc884e02be697bfd4def621d26)
    Reviewed-on: https://gerrit.libreoffice.org/43109
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index aa2992b9cbe0..47eda10aedf3 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -767,7 +767,7 @@ void WinSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout)
     if (!bUseOpenGL)
     {
         // no OpenGL, just classic rendering
-        DrawTextLayout(rLayout, hDC, !bForceGDI);
+        DrawTextLayout(rLayout, hDC, false);
     }
     else if (!bForceGDI && CacheGlyphs(rLayout) &&
              DrawCachedGlyphs(rLayout))