vcl/source/gdi/outdev3.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 4c831dd9e53163d75073c627c774f59fdaf9e874
Author: Sean Young <s...@mess.org>
Date: Sun May 19 13:38:33 2013 +0100
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 1900093..a4fde37 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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
