diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-11-20 21:09:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-11-21 16:17:47 +0100 |
| commit | 538ebbd4fa4241d59e49e33d3cedd04e02ca9287 (patch) | |
| tree | 6f80e8021d72553294b233c85cca611d13406c06 /vcl/source/font/fontcache.cxx | |
| parent | 7bf26fa8c848a15dde1c7c6b94edbee759a523d1 (diff) | |
remove FontAttributes::meCharSet
its baked in that Symbol means RTL_TEXTENCODING_SYMBOL, so accept
that status quo and make it explicit
Change-Id: I78d90965e3d6b4543cd74a7847e13246485380d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143010
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/font/fontcache.cxx')
| -rw-r--r-- | vcl/source/font/fontcache.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/font/fontcache.cxx b/vcl/source/font/fontcache.cxx index ef08a5467321..9fde6e5407a0 100644 --- a/vcl/source/font/fontcache.cxx +++ b/vcl/source/font/fontcache.cxx @@ -64,7 +64,7 @@ bool ImplFontCache::IFSD_Equal::operator()(const vcl::font::FontSelectPattern& r // Symbol fonts may recode from one type to another So they are only // safely equivalent for equal targets - if (rA.IsSymbolFont() || rB.IsSymbolFont()) + if (rA.IsMicrosoftSymbolEncoded() || rB.IsMicrosoftSymbolEncoded()) { if (rA.maTargetName != rB.maTargetName) return false; @@ -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->IsSymbolFont() || aFontSelData.IsSymbolFont() ) + if( pFontData->IsMicrosoftSymbolEncoded() || aFontSelData.IsMicrosoftSymbolEncoded() ) { if( aFontSelData.maTargetName != aFontSelData.maSearchName ) pFontInstance->mpConversion = ConvertChar::GetRecodeData( aFontSelData.maTargetName, aFontSelData.maSearchName ); |