Make use of IsStarSymbol()

Reviewed-on: https://gerrit.libreoffice.org/4077
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Signed-off-by: Luboš Luňák <l.lunak@suse.cz>

Conflicts:
include/unotools/fontdefs.hxx
oox/source/export/drawingml.cxx
sw/source/filter/ww8/writerhelper.cxx
sw/source/filter/ww8/writerhelper.hxx
vcl/generic/fontmanager/fontsubst.cxx
vcl/generic/glyphs/gcach_ftyp.cxx
vcl/source/gdi/outdev3.cxx

Change-Id: I7a2e3a6f11bbaaaff50e8163e4ce3e2583b1d03c

4 files changed, 4 insertions, 23 deletions

diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index b540868a3f96..bc39b9af24d8 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -648,14 +648,6 @@ namespace sw
             }
         }
 
-        bool IsStarSymbol(const rtl::OUString &rFontName)
-        {
-            xub_StrLen nIndex = 0;
-            rtl::OUString sFamilyNm(GetNextFontToken(rFontName, nIndex));
-            return (sFamilyNm.equalsIgnoreAsciiCase("starsymbol") ||
-                sFamilyNm.equalsIgnoreAsciiCase("opensymbol"));
-        }
-
         Size GetSwappedInSize(const SwNoTxtNode& rNd)
         {
             Size aGrTwipSz(rNd.GetTwipSize());
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index f1361a819368..074504df6a85 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -730,18 +730,6 @@ namespace sw
         */
         Polygon PolygonFromPolyPolygon(const PolyPolygon &rPolyPoly);
 
-        /** Determine if the font is the special Star|Open Symbol font
-
-            @param rFontName
-            The FontName to test for being Star|Open Symbol
-
-            @return true if this is Star|Open Symbol
-
-            @author
-            <a href="mailto:cmc@openoffice.org">Caol&aacute;n McNamara</a>
-        */
-        bool IsStarSymbol(const rtl::OUString &rFontName);
-
         /** Make setting a drawing object's layer in a Writer document easy
 
 
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 12e9a1c9a3b6..c7f2e259dbb3 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -311,7 +311,7 @@ namespace myImplHelpers
     String FindBestMSSubstituteFont(const String &rFont)
     {
         String sRet;
-        if (sw::util::IsStarSymbol(rFont))
+        if ( IsStarSymbol(rFont) )
             sRet.ASSIGN_CONST_ASC("Arial Unicode MS");
         else
             sRet = GetSubsFontName(rFont, SUBSFONT_ONLYONE | SUBSFONT_MS);
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index d64c9bc2e325..f8de8caed0d3 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -28,6 +28,7 @@
 #include <paratr.hxx>
 #include <charfmt.hxx>
 #include <ndtxt.hxx>
+#include <unotools/fontcfg.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 
 #include <writerfilter/doctok/sprmids.hxx>
@@ -386,7 +387,7 @@ void MSWordExportBase::AbstractNumberingDefinitions()
                 sFontName = pBulletFont->GetName();
                 eFamily = pBulletFont->GetFamily();
 
-                if ( sw::util::IsStarSymbol( sFontName ) )
+                if ( IsStarSymbol(sFontName) )
                     SubstituteBullet( sNumStr, eChrSet, sFontName );
 
                 // #i86652#
@@ -644,7 +645,7 @@ void WW8Export::BuildAnlvBulletBase(WW8_ANLV& rAnlv, sal_uInt8*& rpCh,
         String sFontName = rFont.GetName();
 
         sal_uInt16 nFontId;
-        if (sw::util::IsStarSymbol(sFontName))
+        if ( IsStarSymbol(sFontName) )
         {
             /*
             If we are starsymbol then in ww7- mode we will always convert to a