diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-05-28 10:53:03 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-06-07 11:56:33 +0200 |
| commit | d04ef1f208d6a32ffa3bdb56b951f85854bca897 (patch) | |
| tree | 7c9b3a99874aafa5e344e3e5b302d8ae77d6b61b /vcl/source/gdi | |
| parent | 46f61ee3997c4c6e1a1dca8b2986f31f0e4a6167 (diff) | |
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
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/metaact.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index b1bc2bc334d1..448d4209fa4c 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -26,6 +26,7 @@ #include <vcl/metaact.hxx> #include <vcl/graphictools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <unotools/fontdefs.hxx> // ======================================================================== @@ -3437,9 +3438,8 @@ MetaFontAction::MetaFontAction( const Font& rFont ) : // 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( ( ( maFont.GetName().SearchAscii( "StarSymbol" ) != STRING_NOTFOUND ) - || ( maFont.GetName().SearchAscii( "OpenSymbol" ) != STRING_NOTFOUND ) ) - && ( maFont.GetCharSet() != RTL_TEXTENCODING_UNICODE ) ) + if ( IsStarSymbol( maFont.GetName() ) + && ( maFont.GetCharSet() != RTL_TEXTENCODING_UNICODE ) ) { maFont.SetCharSet( RTL_TEXTENCODING_UNICODE ); } diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index f7640f8ba204..3679d5a0881a 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -745,8 +745,7 @@ PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagi { // StarSymbol is a unicode font, but it still deserves the symbol flag if( !mbSymbolFlag ) - if( 0 == GetFamilyName().CompareIgnoreCaseToAscii( "starsymbol", 10) - || 0 == GetFamilyName().CompareIgnoreCaseToAscii( "opensymbol", 10) ) + if ( IsStarSymbol( GetFamilyName() ) ) mbSymbolFlag = true; } |