stop setting OpenSymbol as a "Symbol" font
which has a specific meaning of a Windows Symbol encoding
Change-Id: I6e5d079303fccfabc8204fc0dbae0870efb839a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142947
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/vcl/qt5/QtFontFace.cxx b/vcl/qt5/QtFontFace.cxx
index d45fadaf..351f597 100644
--- a/vcl/qt5/QtFontFace.cxx
+++ b/vcl/qt5/QtFontFace.cxx
@@ -108,8 +108,6 @@ void QtFontFace::fillAttributesFromQFont(const QFont& rFont, FontAttributes& rFA
QFontInfo aFontInfo(rFont);
rFA.SetFamilyName(toOUString(aFontInfo.family()));
if (IsOpenSymbol(toOUString(aFontInfo.family())))
rFA.SetSymbolFlag(true);
rFA.SetStyleName(toOUString(aFontInfo.styleName()));
rFA.SetPitch(aFontInfo.fixedPitch() ? PITCH_FIXED : PITCH_VARIABLE);
rFA.SetWeight(QtFontFace::toFontWeight(aFontInfo.weight()));
@@ -142,8 +140,6 @@ QtFontFace* QtFontFace::fromQFontDatabase(const QString& aFamily, const QString&
FontAttributes aFA;
aFA.SetFamilyName(toOUString(aFamily));
if (IsOpenSymbol(aFA.GetFamilyName()))
aFA.SetSymbolFlag(true);
aFA.SetStyleName(toOUString(aStyle));
aFA.SetPitch(isFixedPitch ? PITCH_FIXED : PITCH_VARIABLE);
aFA.SetWeight(QtFontFace::toFontWeight(weigh));
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx
index cf98491..cd4254d 100644
--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -45,10 +45,6 @@ PhysicalFontFace::PhysicalFontFace(const FontAttributes& rDFA)
, mpHbFace(nullptr)
, mpHbUnscaledFont(nullptr)
{
// OpenSymbol is a unicode font, but it still deserves the symbol flag
if (!IsSymbolFont())
if (IsOpenSymbol(GetFamilyName()))
SetSymbolFlag(true);
}
PhysicalFontFace::~PhysicalFontFace()
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 3477ce1..db2bd61 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -516,10 +516,6 @@ void FreetypeFont::GetFontMetric(ImplFontMetricDataRef const & rxTo) const
rxTo->SetOrientation(mrFontInstance.GetFontSelectPattern().mnOrientation);
//Always consider [open]symbol as symbol fonts
if ( IsOpenSymbol( rxTo->GetFamilyName() ) )
rxTo->SetSymbolFlag( true );
FT_Activate_Size( maSizeFT );
rxTo->ImplCalcLineSpacing(&mrFontInstance);
