diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-03-19 19:14:31 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-03-21 16:21:35 +0100 |
| commit | 160ff36d2593a24b6a933332ab5d66683528403c (patch) | |
| tree | 53931a2c74deba9250e7f1a3c336e8a565a0fc73 /vcl/source/gdi | |
| parent | c3ffeb01a9f868c734ce235a6d38ce51b80ca05e (diff) | |
fix SalLayoutGlyphs caching with MultiSalLayout
Writer's testTdf90069 was failing if there was the documents font
actually installed. If glyphs for layout are cached, it is still
necessary to do the fallback, and that needs setting the fallback
as needed.
Change-Id: I32bf453d2e46fd8f1cf53a1298d0bc4195a1b78c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112774
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/CommonSalLayout.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index 2ef3c98d2f9d..5565b3eb4d69 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -296,6 +296,9 @@ bool GenericSalLayout::LayoutText(ImplLayoutArgs& rArgs, const SalLayoutGlyphsIm { // Work with pre-computed glyph items. m_GlyphItems = *pGlyphs; + for(const GlyphItem& item : m_GlyphItems) + if(!item.glyphId()) + SetNeedFallback(rArgs, item.charPos(), item.IsRTLGlyph()); // Some flags are set as a side effect of text layout, restore them here. rArgs.mnFlags |= pGlyphs->mnFlags; return true; |