[PATCH] If a Symbol font is missing, ensure that conversion is done

[Sean Young (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4037

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/4037/1

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
---
M vcl/source/gdi/outdev3.cxx
1 file changed, 7 insertions(+), 0 deletions(-)



diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 393c2fb..f5332fe 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -2309,6 +2309,13 @@
         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;
 }

-- 
To view, visit https://gerrit.libreoffice.org/4037
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice361f183c9f42aa562d4caab1d589417ad3fc9a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Sean Young <sean at mess.org>