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/unx/generic | |
| 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/unx/generic')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontsubst.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx index 0f429723b21e..d4fae2f79085 100644 --- a/vcl/unx/generic/fontmanager/fontsubst.cxx +++ b/vcl/unx/generic/fontmanager/fontsubst.cxx @@ -99,7 +99,7 @@ namespace bool FcPreMatchSubstitution::FindFontSubstitute(vcl::font::FontSelectPattern &rFontSelData) const { // We don't actually want to talk to Fontconfig at all for symbol fonts - if( rFontSelData.IsSymbolFont() ) + if( rFontSelData.IsMicrosoftSymbolEncoded() ) return false; // OpenSymbol is a unicode font, but it still deserves to be treated as a symbol font if ( IsOpenSymbol(rFontSelData.maSearchName) ) @@ -175,7 +175,7 @@ bool FcGlyphFallbackSubstitution::FindFontSubstitute(vcl::font::FontSelectPatter OUString& rMissingCodes ) const { // We don't actually want to talk to Fontconfig at all for symbol fonts - if( rFontSelData.IsSymbolFont() ) + if( rFontSelData.IsMicrosoftSymbolEncoded() ) return false; // OpenSymbol is a unicode font, but it still deserves to be treated as a symbol font if ( IsOpenSymbol(rFontSelData.maSearchName) ) diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 29049cb44d69..54496bff8d6c 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -309,7 +309,7 @@ FontAttributes GenPspGraphics::Info2FontAttributes( const psp::FastPrintFontInfo aDFA.SetItalic( rInfo.m_eItalic ); aDFA.SetWidthType( rInfo.m_eWidth ); aDFA.SetPitch( rInfo.m_ePitch ); - aDFA.SetSymbolFlag( rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL ); + aDFA.SetMicrosoftSymbolEncoded( rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL ); aDFA.SetQuality(512); // add font family name aliases |