summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-04-11 17:00:07 +0100
committerMichael Stahl <michael.stahl@allotropia.de>2023-04-13 10:44:38 +0200
commit01cbe691e6c64dbccdc839d79204b45742b343fb (patch)
tree40f77167f3f13e27936004ab2a49cde37da7a444
parenttdf#154658: XML Form Document: Fields doesnt calculate any more (diff)
downloadcore-01cbe691e6c64dbccdc839d79204b45742b343fb.tar.gz
core-01cbe691e6c64dbccdc839d79204b45742b343fb.zip
tdf#154753 if substituting with OpenSymbol check if there for a recode
entry for that font->OpenSymbol conversion. It might make sense to drop the conditionals and just use the result of ConvertChar::GetRecodeData if there are any, but keep close to what has worked historically. Change-Id: Idf9ee0f8068f1ff8e7f179ba5087763e44ade268 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150201 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--vcl/source/font/fontcache.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx
index 9fde6e5407a0..58b68baa9fe3 100644
--- a/vcl/source/font/fontcache.cxx
+++ b/vcl/source/font/fontcache.cxx
@@ -152,7 +152,7 @@ rtl::Reference<LogicalFontInstance> ImplFontCache::GetFontInstance( PhysicalFont
// if we're substituting from or to a symbol font we may need a symbol
// conversion table
- if( pFontData->IsMicrosoftSymbolEncoded() || aFontSelData.IsMicrosoftSymbolEncoded() )
+ if( pFontData->IsMicrosoftSymbolEncoded() || aFontSelData.IsMicrosoftSymbolEncoded() || IsOpenSymbol(aFontSelData.maSearchName) )
{
if( aFontSelData.maTargetName != aFontSelData.maSearchName )
pFontInstance->mpConversion = ConvertChar::GetRecodeData( aFontSelData.maTargetName, aFontSelData.maSearchName );