diff options
| author | Sean Young <sean@mess.org> | 2013-05-19 13:38:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-27 12:31:19 +0000 |
| commit | 4c831dd9e53163d75073c627c774f59fdaf9e874 (patch) | |
| tree | 0ea88fd5a949bfc68574b2ac54a64ee391f12ab1 | |
| parent | 13635ca1ec3aba641c93a2199cfe7406c98e3f17 (diff) | |
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/4037
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 19000931ac90..a4fde373936c 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -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; } |