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

[Tor Lillqvist]

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

New commits:
commit 3b74c0f8b750cfe89598358fba811f4900287b64
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Dec 7 14:01:39 2015 +0200

    tdf#96070: Just give up on glyph caching for non-horizontal text
    
    Change-Id: I60f54523f927e97d739a4c735e54b2cc3400aff3
    Reviewed-on: https://gerrit.libreoffice.org/20436
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index abbdc5a..3f5a78c 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -371,7 +371,8 @@ bool ImplWinFontEntry::AddChunkOfGlyphs(int nGlyphIndex, const WinLayout& rLayou
         aChunk.mbVertical = false;
     }
 
-    if (aChunk.mbVertical && aLogfont.lfEscapement != 2700)
+    // Don't even try to handle non-horizontal text
+    if (aChunk.mbVertical || aLogfont.lfEscapement != 0)
         return false;
 
     OpenGLCompatibleDC aDC(rGraphics, 0, 0, nBitmapWidth, nBitmapHeight);