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

[Tor Lillqvist]

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

New commits:
commit 8b4268dc9e142ce9e192e28989096db67796eb7c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Aug 31 17:46:08 2015 +0300

    Compensate for the extra two pixels in ImplWinFontEntry::AddChunkOfGlyphs()
    
    Should do similarly for vertical text, too.
    
    Change-Id: I51f5ee3ba1686f151b04f98c43388e0bdfac97fb
    (cherry picked from commit 860d6948cc56104f7de3d5bf3b5aa1d7f1fbd840)
    Reviewed-on: https://gerrit.libreoffice.org/18181
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 4718a8d..ae49357 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1755,7 +1755,7 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics& rGraphics) const
             {
                 SalTwoRect a2Rects(rChunk.maLocation[n].Left(), rChunk.maLocation[n].Top(),
                                    rChunk.maLocation[n].getWidth(), rChunk.maLocation[n].getHeight(),
-                                   nAdvance + aPos.X() + mpGlyphOffsets[i].du, aPos.Y() + mpGlyphOffsets[i].dv - rChunk.mnAscentPlusIntLeading,
+                                   nAdvance + aPos.X() + mpGlyphOffsets[i].du - 2, aPos.Y() + mpGlyphOffsets[i].dv - rChunk.mnAscentPlusIntLeading,
                                    rChunk.maLocation[n].getWidth(), rChunk.maLocation[n].getHeight()); // ???
                 pImpl->DrawMask(*rChunk.mpTexture, salColor, a2Rects);
             }