Kaydet (Commit) b2e81e11 authored tarafından Khaled Hosny's avatar Khaled Hosny Kaydeden (comit) Miklos Vajna

tdf#124109: Fix missing kashida glyphs

This partially reverts:

commit 436b829f
Author: Miklos Vajna <vmiklos@collabora.co.uk>
Date:   Thu Aug 16 17:35:17 2018 +0200

    sw: save one vcl layout call in SwFntObj::DrawText()

    Pressing a key in Writer used to lay out the relevant string 4 times
    (counting GenericSalLayout::LayoutText() invocations), save one of them
    by pre-calculating the layout and sharing it between GetTextArray() and
    DrawTextArray().

The reverted part was causing inserted Kashida to be missing, leaving gaps
inside the words. See attachment in the bug report.

Change-Id: Iaafbc793ed5906e6fdf3dcb03c54d5a440e15da4
Reviewed-on: https://gerrit.libreoffice.org/69530
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
(cherry picked from commit f8ca6e0a)
Reviewed-on: https://gerrit.libreoffice.org/69547
üst 6bbcf6e2
......@@ -1811,9 +1811,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
? (rInf.GetIdx() ? 1 : 0)
: sal_Int32(rInf.GetIdx());
aGlyphsKey = SwTextGlyphsKey{ &rInf.GetOut(), *pStr, nTmpIdx, nLen };
pGlyphs = lcl_CreateLayout(aGlyphsKey, m_aTextGlyphs[aGlyphsKey]);
rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, pKernArray.get(),
nTmpIdx , nLen, SalLayoutFlags::NONE, pGlyphs );
nTmpIdx , nLen );
if (bBullet)
{
rInf.GetOut().Push();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment