diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-11-18 11:34:13 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2022-11-18 14:55:12 +0100 |
commit | 003c837e9d029a671ea95f76da45573bbc260eea (patch) | |
tree | d372f62eab0a7afc9a07122284680be35e3c035b /vcl | |
parent | a4a865a85cfc922e75ed2ad5188e45a76bca92aa (diff) |
rename IsStarSymbol to IsOpenSymbol
Change-Id: If525ba9826f5bc2d860233cbabf58d1d290be054
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142936
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/qt5/QtFontFace.cxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/wmf/wmfwr.cxx | 2 | ||||
-rw-r--r-- | vcl/source/font/PhysicalFontFace.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/metaact.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontsubst.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 4 | ||||
-rw-r--r-- | vcl/win/gdi/salfont.cxx | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/vcl/qt5/QtFontFace.cxx b/vcl/qt5/QtFontFace.cxx index 9fd2eb56b2fb..d45fadafe87e 100644 --- a/vcl/qt5/QtFontFace.cxx +++ b/vcl/qt5/QtFontFace.cxx @@ -108,7 +108,7 @@ void QtFontFace::fillAttributesFromQFont(const QFont& rFont, FontAttributes& rFA QFontInfo aFontInfo(rFont); rFA.SetFamilyName(toOUString(aFontInfo.family())); - if (IsStarSymbol(toOUString(aFontInfo.family()))) + if (IsOpenSymbol(toOUString(aFontInfo.family()))) rFA.SetSymbolFlag(true); rFA.SetStyleName(toOUString(aFontInfo.styleName())); rFA.SetPitch(aFontInfo.fixedPitch() ? PITCH_FIXED : PITCH_VARIABLE); @@ -142,7 +142,7 @@ QtFontFace* QtFontFace::fromQFontDatabase(const QString& aFamily, const QString& FontAttributes aFA; aFA.SetFamilyName(toOUString(aFamily)); - if (IsStarSymbol(aFA.GetFamilyName())) + if (IsOpenSymbol(aFA.GetFamilyName())) aFA.SetSymbolFlag(true); aFA.SetStyleName(toOUString(aStyle)); aFA.SetPitch(isFixedPitch ? PITCH_FIXED : PITCH_VARIABLE); diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 2c287c8b693f..7c209b3a02ee 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -497,7 +497,7 @@ bool WMFWriter::WMFRecord_Escape_Unicode( const Point& rPoint, const OUString& r } } - if ( ( i != nStringLen ) || IsStarSymbol( aSrcFont.GetFamilyName() ) ) // after conversion the characters are not original, so we + if ( ( i != nStringLen ) || IsOpenSymbol( aSrcFont.GetFamilyName() ) ) // after conversion the characters are not original, so we { // will store the unicode string and a polypoly replacement Color aOldFillColor( aSrcFillColor ); Color aOldLineColor( aSrcLineColor ); diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index 975ace9ad264..81f63d221013 100644 --- a/vcl/source/font/PhysicalFontFace.cxx +++ b/vcl/source/font/PhysicalFontFace.cxx @@ -46,9 +46,9 @@ PhysicalFontFace::PhysicalFontFace(const FontAttributes& rDFA) , mpHbUnscaledFont(nullptr) , mbFontCapabilitiesRead(false) { - // StarSymbol is a unicode font, but it still deserves the symbol flag + // OpenSymbol is a unicode font, but it still deserves the symbol flag if (!IsSymbolFont()) - if (IsStarSymbol(GetFamilyName())) + if (IsOpenSymbol(GetFamilyName())) SetSymbolFlag(true); } diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index 035ba8cd45e5..cc92677c72b7 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -1679,11 +1679,11 @@ MetaFontAction::MetaFontAction( vcl::Font aFont ) : MetaAction ( MetaActionType::FONT ), maFont (std::move( aFont )) { - // #96876: because RTL_TEXTENCODING_SYMBOL is often set at the StarSymbol font, + // #96876: because RTL_TEXTENCODING_SYMBOL is often set at the OpenSymbol font, // we change the textencoding to RTL_TEXTENCODING_UNICODE here, which seems // to be the right way; changing the textencoding at other sources // is too dangerous at the moment - if ( IsStarSymbol( maFont.GetFamilyName() ) + if ( IsOpenSymbol( maFont.GetFamilyName() ) && ( maFont.GetCharSet() != RTL_TEXTENCODING_UNICODE ) ) { maFont.SetCharSet( RTL_TEXTENCODING_UNICODE ); diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx index afbe53dd4a81..0f429723b21e 100644 --- a/vcl/unx/generic/fontmanager/fontsubst.cxx +++ b/vcl/unx/generic/fontmanager/fontsubst.cxx @@ -101,8 +101,8 @@ bool FcPreMatchSubstitution::FindFontSubstitute(vcl::font::FontSelectPattern &rF // We don't actually want to talk to Fontconfig at all for symbol fonts if( rFontSelData.IsSymbolFont() ) return false; - // StarSymbol is a unicode font, but it still deserves the symbol flag - if ( IsStarSymbol(rFontSelData.maSearchName) ) + // OpenSymbol is a unicode font, but it still deserves to be treated as a symbol font + if ( IsOpenSymbol(rFontSelData.maSearchName) ) return false; //see fdo#41556 and fdo#47636 @@ -177,8 +177,8 @@ bool FcGlyphFallbackSubstitution::FindFontSubstitute(vcl::font::FontSelectPatter // We don't actually want to talk to Fontconfig at all for symbol fonts if( rFontSelData.IsSymbolFont() ) return false; - // StarSymbol is a unicode font, but it still deserves the symbol flag - if ( IsStarSymbol(rFontSelData.maSearchName) ) + // OpenSymbol is a unicode font, but it still deserves to be treated as a symbol font + if ( IsOpenSymbol(rFontSelData.maSearchName) ) return false; const vcl::font::FontSelectPattern aOut = GetFcSubstitute( rFontSelData, rMissingCodes ); diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 460142a66ae8..d0f9e2588c5e 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -520,8 +520,8 @@ void FreetypeFont::GetFontMetric(ImplFontMetricDataRef const & rxTo) const rxTo->SetOrientation(mrFontInstance.GetFontSelectPattern().mnOrientation); - //Always consider [star]symbol as symbol fonts - if ( IsStarSymbol( rxTo->GetFamilyName() ) ) + //Always consider [open]symbol as symbol fonts + if ( IsOpenSymbol( rxTo->GetFamilyName() ) ) rxTo->SetSymbolFlag( true ); FT_Activate_Size( maSizeFT ); diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index e2305d3f49ee..c41d0427f5cb 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -162,7 +162,7 @@ const std::map<OUString, OUString> aBitmapFontSubs = // TODO: See if Windows have API that we can use here to improve font fallback. bool WinPreMatchFontSubstititution::FindFontSubstitute(vcl::font::FontSelectPattern& rFontSelData) const { - if (rFontSelData.IsSymbolFont() || IsStarSymbol(rFontSelData.maSearchName)) + if (rFontSelData.IsSymbolFont() || IsOpenSymbol(rFontSelData.maSearchName)) return false; for (const auto& aSub : aBitmapFontSubs) |