diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 10:22:06 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-15 10:22:06 +0100 |
commit | e09a8259e417cdb571fa1794e990e582cc7360e0 (patch) | |
tree | 5c2c658dbbd7513c023e5d62d45fa960b87c405b /xmlhelp/source/cxxhelp/provider/databases.cxx | |
parent | f273d6707685816a1eddc849d66f828c4666f5dc (diff) |
xmlhelp: Use appropriate OUString functions on string constants
Change-Id: I28f68ff0c43366b3877244ba272acf967f141e54
Diffstat (limited to 'xmlhelp/source/cxxhelp/provider/databases.cxx')
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index a6c8d3e9c96a..1a918f3c036f 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -274,7 +274,7 @@ OString Databases::getImagesZipFileURL() if ( !aSymbolsStyleName.isEmpty() ) { - if ( aSymbolsStyleName.equalsAscii("auto") ) + if ( aSymbolsStyleName == "auto" ) { // with the layered images*.zip, tango is the most // complete theme, so show that one @@ -418,8 +418,8 @@ const std::vector< OUString >& Databases::getModuleList( const OUString& Languag ( str[idx + 1] == 'c' || str[idx + 1] == 'C' ) && ( str[idx + 2] == 'f' || str[idx + 2] == 'F' ) && ( str[idx + 3] == 'g' || str[idx + 3] == 'G' ) && - !( fileName = fileName.copy(0,idx).toAsciiLowerCase() ).equalsAscii( "picture" ) ) { - if(! m_bShowBasic && fileName.equalsAscii("sbasic") ) + ( fileName = fileName.copy(0,idx).toAsciiLowerCase() ) != "picture" ) { + if(! m_bShowBasic && fileName == "sbasic" ) continue; m_avModules.push_back( fileName ); } @@ -630,21 +630,21 @@ Databases::getCollator( const OUString& Language, OUString countryStr = country(Language); if( countryStr.isEmpty() ) { - if( langStr.equalsAscii("de") ) + if( langStr == "de" ) countryStr = "DE"; - else if( langStr.equalsAscii("en") ) + else if( langStr == "en" ) countryStr = "US"; - else if( langStr.equalsAscii("es") ) + else if( langStr == "es" ) countryStr = "ES"; - else if( langStr.equalsAscii("it") ) + else if( langStr == "it" ) countryStr = "IT"; - else if( langStr.equalsAscii("fr") ) + else if( langStr == "fr" ) countryStr = "FR"; - else if( langStr.equalsAscii("sv") ) + else if( langStr == "sv" ) countryStr = "SE"; - else if( langStr.equalsAscii("ja") ) + else if( langStr == "ja" ) countryStr = "JP"; - else if( langStr.equalsAscii("ko") ) + else if( langStr == "ko" ) countryStr = "KR"; } /* FIXME-BCP47: all this does not look right for language tag context, @@ -1062,7 +1062,7 @@ void Databases::cascadingStylesheet( const OUString& Language, bool bHighContrastMode = false; OUString aCSS( m_aCSS ); - if ( aCSS.equalsAscii( "default" ) ) + if ( aCSS == "default" ) { // #i50760: "default" needs to adapt HC mode uno::Reference< awt::XToolkit2 > xToolkit = |