diff options
| author | elixir <prashant3.yishu@gmail.com> | 2013-03-07 19:35:49 +0530 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-11 15:50:44 +0000 |
| commit | 7d1f4cdec307bb1e761bb5dd3d8231bba5833e10 (patch) | |
| tree | 106a20fe24e8935e9b4943f17dad49dba67aa013 /vcl/generic | |
| parent | c9d7427707ca36f60079833f53efd435202fe231 (diff) | |
fdo#38838: Converting String/UniString to OUString
Change-Id: If64db96005fcd8a42e4fa24041867b99183965f9
Reviewed-on: https://gerrit.libreoffice.org/2586
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/fontmanager/fontsubst.cxx | 12 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 4 | ||||
| -rw-r--r-- | vcl/generic/glyphs/glyphcache.cxx | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 2234bdb11a91..fac314cd6fcd 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( 0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( "starsymbol", 10) - || 0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( "opensymbol", 10) ) + if( 0 == rFontSelData.maSearchName.compareTo( "starsymbol", 10) + || 0 == rFontSelData.maSearchName.compareTo( "opensymbol", 10) ) return false; //see fdo#41556 and fdo#47636 @@ -187,7 +187,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa rtl::OUString aDummy; const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, aDummy ); - if( !aOut.maSearchName.Len() ) + if( !aOut.maSearchName.getLength() ) return false; const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut ); @@ -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( 0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( "starsymbol", 10) - || 0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( "opensymbol", 10) ) + if( 0 == rFontSelData.maSearchName.compareTo( "starsymbol", 10) + || 0 == rFontSelData.maSearchName.compareTo( "opensymbol", 10) ) return false; const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, rMissingCodes ); @@ -238,7 +238,7 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont // FC doing it would be preferable because it knows the invariables // e.g. FC knows the FC rule that all Arial gets replaced by LiberationSans // whereas we would have to check for every size or attribute - if( !aOut.maSearchName.Len() ) + if( !aOut.maSearchName.getLength() ) return false; const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut ); diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index df24b7662135..aac80883830b 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -945,8 +945,8 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const //Always consider [star]symbol as symbol fonts if ( - (rTo.GetFamilyName().EqualsAscii("OpenSymbol")) || - (rTo.GetFamilyName().EqualsAscii("StarSymbol")) + (rTo.GetFamilyName() == "OpenSymbol" ) || + (rTo.GetFamilyName() == "StarSymbol" ) ) { rTo.SetSymbolFlag( true ); diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 79a2d7a421fd..1d1322c7a702 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -86,7 +86,7 @@ size_t GlyphCache::IFSD_Hash::operator()( const FontSelectPattern& rFontSelData // TODO: is it worth to improve this hash function? sal_IntPtr nFontId = reinterpret_cast<sal_IntPtr>( rFontSelData.mpFontData ); #ifdef ENABLE_GRAPHITE - if (rFontSelData.maTargetName.Search(grutils::GrFeatureParser::FEAT_PREFIX) + if (rFontSelData.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) != STRING_NOTFOUND) { rtl::OString aFeatName = rtl::OUStringToOString( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); @@ -138,9 +138,9 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font if (rA.meLanguage != rB.meLanguage) return false; // check for features - if ((rA.maTargetName.Search(grutils::GrFeatureParser::FEAT_PREFIX) + if ((rA.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) != STRING_NOTFOUND || - rB.maTargetName.Search(grutils::GrFeatureParser::FEAT_PREFIX) + rB.maTargetName.indexOf(grutils::GrFeatureParser::FEAT_PREFIX) != STRING_NOTFOUND) && rA.maTargetName != rB.maTargetName) return false; #endif |