[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/font/fontcache.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 01cbe691e6c64dbccdc839d79204b45742b343fb
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Apr 11 17:00:07 2023 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Apr 13 10:44:38 2023 +0200

    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.st...@allotropia.de>

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 );