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

[Miklos Vajna]

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

New commits:
commit 7ea01e865114e9f46945b1d721f1360b516df7c9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Sep 7 17:10:16 2015 +0200

    windows opengl: fix CppunitTest_writerperfect_writer
    
    (cherry picked from commit b5df051cc5d734ef9fd77a5336d2bb8d1d4557c9)
    
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 315a112f28b480e8e90d42a8ab45d1b448490939)
    
    Change-Id: I4a7199633d0d940ae009ac144989da7d6c9262ec
    Reviewed-on: https://gerrit.libreoffice.org/18463
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 139d9af..da72f11 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1763,6 +1763,10 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics& rGraphics) const
 
         for (int i = nMinGlyphPos; i < nEndGlyphPos; i++)
         {
+            // Ignore dropped glyphs.
+            if (mpOutGlyphs[i] == DROPPED_OUTGLYPH)
+                continue;
+
             assert(mrWinFontEntry.GlyphIsCached(mpOutGlyphs[i]));
 
             const OpenGLGlyphCacheChunk& rChunk = mrWinFontEntry.GetCachedGlyphChunkFor(mpOutGlyphs[i]);