vcl/source/gdi/impglyphitem.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit ede2b2e70c33754df6643b7eb505b4db1e7e872d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Nov 22 17:03:46 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Nov 22 22:17:50 2022 +0100
crashtesting: restore workaround
for tdf119074-1.odt, while I have a strong memory of testing that it
solved the problem, I know find that it doesn't.
Change-Id: Id7fc800702c6a417810cba22f180d933d9fcd9b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143125
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx
index b3422ae1a29f..2ee4938f51d8 100644
--- a/vcl/source/gdi/impglyphitem.cxx
+++ b/vcl/source/gdi/impglyphitem.cxx
@@ -327,6 +327,10 @@ SalLayoutGlyphsCache::GetLayoutGlyphs(VclPtr<const
OutputDevice> outputDevice, c
if (nLen == 0)
return nullptr;
const CachedGlyphsKey key(outputDevice, text, nIndex, nLen, nLogicWidth);
+ // for now disable if the font is the one seen in tdf#119074
+ // https://github.com/harfbuzz/harfbuzz/issues/3824
+ if (key.fontMetric.GetFamilyName() == "XB Roya")
+ return nullptr;
GlyphsCache::const_iterator it = mCachedGlyphs.find(key);
if (it != mCachedGlyphs.end())
{
