2 files changed, 5 insertions, 10 deletions
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 900125baa35f..22b3d837863b 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -32,6 +32,7 @@
 #include "salprn.hxx"
 #include "region.h"
 
+#include <unotools/fontdefs.hxx>
 #include <list>
 
 // ===========================================================================
@@ -160,8 +161,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
     if( rFontSelData.IsSymbolFont() )
         return false;
     // StarSymbol is a unicode font, but it still deserves the symbol flag
-    if(rFontSelData.maSearchName.startsWithIgnoreAsciiCase( "starsymbol" )
-    || rFontSelData.maSearchName.startsWithIgnoreAsciiCase( "opensymbol" ) )
+    if ( IsStarSymbol(rFontSelData.maSearchName) )
         return false;
 
     //see fdo#41556 and fdo#47636
@@ -229,8 +229,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont
     if( rFontSelData.IsSymbolFont() )
         return false;
     // StarSymbol is a unicode font, but it still deserves the symbol flag
-    if(rFontSelData.maSearchName.startsWithIgnoreAsciiCase( "starsymbol" )
-    || rFontSelData.maSearchName.startsWithIgnoreAsciiCase( "opensymbol" ) )
+    if ( IsStarSymbol(rFontSelData.maSearchName) )
         return false;
 
     const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, rMissingCodes );
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 0dfab940a40f..cdcfe4ca5fde 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -33,6 +33,7 @@
 #include <graphite2/Font.h>
 #include <graphite_layout.hxx>
 #endif
+#include <unotools/fontdefs.hxx>
 
 #include "tools/poly.hxx"
 #include "basegfx/matrix/b2dhommatrix.hxx"
@@ -920,13 +921,8 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
     rTo.mnOrientation = GetFontSelData().mnOrientation;
 
     //Always consider [star]symbol as symbol fonts
-    if (
-         (rTo.GetFamilyName().equalsIgnoreAsciiCase("OpenSymbol")) ||
-         (rTo.GetFamilyName().equalsIgnoreAsciiCase("StarSymbol"))
-       )
-    {
+    if ( IsStarSymbol( rTo.GetFamilyName() ) )
         rTo.SetSymbolFlag( true );
-    }
 
     if( maSizeFT )
         pFTActivateSize( maSizeFT );