Kaydet (Commit) 4c831dd9 authored tarafından Sean Young's avatar Sean Young Kaydeden (comit) Caolán McNamara

fdo#64632 If a Symbol font is missing, ensure that conversion is done

ImplDevFontList::ImplFindByFont() will nearly always return a font, so
we do not go through the code path which sets up conversion.

Change-Id: Ice361f183c9f42aa562d4caab1d589417ad3fc9a
Reviewed-on: https://gerrit.libreoffice.org/4037Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 13635ca1
......@@ -2309,6 +2309,13 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList,
maFontInstanceList[ aFontSelData ] = pEntry;
}
// We might have selected a non-symbol font as a fallback for a
// symbol font. Ensure that conversion is done
if (aFontSelData.IsSymbolFont() && !pEntry->maMetric.IsSymbolFont() && !pEntry->mpConversion)
{
pEntry->mpConversion = ConvertChar::GetRecodeData( aFontSelData.maTargetName, aFontSelData.maSearchName );
}
mpFirstEntry = pEntry;
return pEntry;
}
......
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