diff options
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/misc/fontcvt.cxx | 2 | ||||
| -rw-r--r-- | unotools/source/misc/fontdefs.cxx | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 93d7f9917780..2b44624c39a2 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1354,7 +1354,7 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const if (!cRetVal && mpSubsFontName) { - if (!strcmp(mpSubsFontName, "OpenSymbol") || (!strcmp(mpSubsFontName, "StarSymbol"))) + if ( IsStarSymbol( OUString::createFromAscii(mpSubsFontName) ) ) { cRetVal = 0xE12C; SAL_WARN( "unotools.misc", "Forcing a bullet substition from 0x" << diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index 0932c172c300..b81a5b38c012 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -597,4 +597,12 @@ int FontNameHash::operator()( const String& rStr ) const return nHash; } +bool IsStarSymbol(const OUString &rFontName) +{ + sal_Int32 nIndex = 0; + OUString sFamilyNm(GetNextFontToken(rFontName, nIndex)); + return (sFamilyNm.equalsIgnoreAsciiCase("starsymbol") || + sFamilyNm.equalsIgnoreAsciiCase("opensymbol")); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |