diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-05-19 18:00:39 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-05-19 18:00:44 +0200 |
| commit | 43c234b0481fe63b8c4823affad066c6362f5068 (patch) | |
| tree | 93f397e7d3ed8ece4cc531b20fb2e27c160807f1 /vcl | |
| parent | 79e5615fa103a52ce41ed682b624c13fd9a9d1eb (diff) | |
fix OUString conversion
Both were CompareIgnoreCaseToAscii( "starsymbol", 10) which is
startsWithIgnoreCaseAscii.
Fixes 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10
Change-Id: I21e2eb8c578b65d5f0e4181ed64af02ec480463e
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/fontmanager/fontsubst.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/gdi/outdev3.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 36c683ded6ff..900125baa35f 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -160,8 +160,8 @@ 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.startsWith( "starsymbol" ) - || rFontSelData.maSearchName.startsWith( "opensymbol" ) ) + if(rFontSelData.maSearchName.startsWithIgnoreAsciiCase( "starsymbol" ) + || rFontSelData.maSearchName.startsWithIgnoreAsciiCase( "opensymbol" ) ) return false; //see fdo#41556 and fdo#47636 @@ -229,8 +229,8 @@ 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.startsWith( "starsymbol" ) - || rFontSelData.maSearchName.startsWith( "opensymbol" ) ) + if(rFontSelData.maSearchName.startsWithIgnoreAsciiCase( "starsymbol" ) + || rFontSelData.maSearchName.startsWithIgnoreAsciiCase( "opensymbol" ) ) return false; const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, rMissingCodes ); diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 6744597767cd..87dfec7f1aa3 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -695,8 +695,8 @@ PhysicalFontFace::PhysicalFontFace( const ImplDevFontAttributes& rDFA, int nMagi { // StarSymbol is a unicode font, but it still deserves the symbol flag if( !IsSymbolFont() ) - if( GetFamilyName().startsWith( "starsymbol") - || GetFamilyName().startsWith( "opensymbol") ) + if( GetFamilyName().startsWithIgnoreAsciiCase( "starsymbol" ) + || GetFamilyName().startsWithIgnoreAsciiCase( "opensymbol" ) ) SetSymbolFlag( true ); } |