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

Tor Lillqvist tml at collabora.com
Mon Dec 7 04:05:42 PST 2015


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

New commits:
commit caf52dbc2fa6dbfaf502b7150f13fe38e25443b9
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

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 6e2810e..607426f 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -358,7 +358,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);


More information about the Libreoffice-commits mailing list