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 /unotools/source/misc/fontcvt.cxx | |
| 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 'unotools/source/misc/fontcvt.cxx')
| -rw-r--r-- | unotools/source/misc/fontcvt.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index a11148884854..fe870ed48d1f 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1432,40 +1432,40 @@ static ConvertChar aImplStarSymbolCvt = { NULL, "StarBats", ImplStarSymbolToStar const ConvertChar* ConvertChar::GetRecodeData( const String& rOrgFontName, const String& rMapFontName ) { const ConvertChar* pCvt = NULL; - String aOrgName( rOrgFontName ); + OUString aOrgName( rOrgFontName ); GetEnglishSearchFontName( aOrgName ); - String aMapName( rMapFontName ); + OUString aMapName( rMapFontName ); GetEnglishSearchFontName( aMapName ); - if( aMapName.EqualsAscii( "starsymbol" ) - || aMapName.EqualsAscii( "opensymbol" ) ) + if( aMapName == "starsymbol" + || aMapName == "opensymbol" ) { int nEntries = SAL_N_ELEMENTS(aStarSymbolRecodeTable); for( int i = 0; i < nEntries; ++i) { RecodeTable& r = aStarSymbolRecodeTable[i]; - if( aOrgName.EqualsAscii( r.pOrgName ) ) + if( aOrgName.equalsAscii( r.pOrgName ) ) { pCvt = &r.aCvt; break; } } } //It's plausible that it's better to implement this //as an additional encoding alongside the existing //adobe-symbol to unicode conversion in rtl instead - else if( aMapName.EqualsAscii("applesymbol") ) + else if( aMapName == "applesymbol" ) { int nEntries = SAL_N_ELEMENTS(aAppleSymbolRecodeTable); for( int i = 0; i < nEntries; ++i) { RecodeTable& r = aAppleSymbolRecodeTable[i]; - if( aOrgName.EqualsAscii( r.pOrgName ) ) + if( aOrgName.equalsAscii( r.pOrgName ) ) { pCvt = &r.aCvt; break; } } } - else if( aMapName.EqualsAscii( "starbats" ) ) + else if( aMapName == "starbats" ) { - if( aOrgName.EqualsAscii( "starsymbol" ) ) + if( aOrgName == "starsymbol" ) pCvt = &aImplStarSymbolCvt; - else if( aOrgName.EqualsAscii( "opensymbol" ) ) + else if( aOrgName == "opensymbol" ) pCvt = &aImplStarSymbolCvt; } @@ -1479,7 +1479,7 @@ FontToSubsFontConverter CreateFontToSubsFontConverter( { const ConvertChar* pCvt = NULL; - String aName = rOrgName; + OUString aName = rOrgName; GetEnglishSearchFontName( aName ); if ( nFlags & FONTTOSUBSFONT_IMPORT ) @@ -1490,15 +1490,15 @@ FontToSubsFontConverter CreateFontToSubsFontConverter( for( int i = 0; i < nEntries; ++i ) { RecodeTable& r = aStarSymbolRecodeTable[i]; - if( aName.EqualsAscii( r.pOrgName ) ) + if( aName.equalsAscii( r.pOrgName ) ) { pCvt = &r.aCvt; break; } } } else { // TODO: FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS - if( aName.EqualsAscii( "starsymbol" ) ) pCvt = &aImplStarSymbolCvt; - else if( aName.EqualsAscii( "opensymbol" ) ) pCvt = &aImplStarSymbolCvt; + if( aName == "starsymbol" ) pCvt = &aImplStarSymbolCvt; + else if( aName == "opensymbol" ) pCvt = &aImplStarSymbolCvt; } return (FontToSubsFontConverter)pCvt; |