diff options
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/generic/app/sm.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index e33ccfd50726..be572f29a7c6 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -631,7 +631,7 @@ OString SessionManagerClient::getPreviousSessionID() } } - SAL_INFO("vcl.sm.debug", " previous ID = " << aPrevId.getStr()); + SAL_INFO("vcl.sm.debug", " previous ID = " << aPrevId); return aPrevId; } diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 4b3803231179..6b6b1442778a 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -276,7 +276,7 @@ namespace for( std::vector<lang_and_element>::const_iterator aIter = elements.begin(); aIter != aEnd; ++aIter ) { const char *pLang = reinterpret_cast<const char*>(aIter->first); - if( rtl_str_compare( pLang, sFullMatch.getStr() ) == 0) + if( sFullMatch == pLang) { // both language and country match candidate = aIter->second; @@ -288,7 +288,7 @@ namespace // override candidate only if there is a full match continue; } - else if( rtl_str_compare( pLang, sLangMatch.getStr()) == 0) + else if( sLangMatch == pLang) { // just the language matches candidate = aIter->second; diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 715223809afa..84b3cfd56a89 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -604,7 +604,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const if( aInfo.usubfamily ) pFont->m_aStyleName = OUString( aInfo.usubfamily ); - SAL_WARN_IF( !aInfo.psname, "vcl", "No PostScript name in font:" << aFile.getStr() ); + SAL_WARN_IF( !aInfo.psname, "vcl", "No PostScript name in font:" << aFile ); pFont->m_aPSName = aInfo.psname ? OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : @@ -697,7 +697,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const bSuccess = true; } else - SAL_WARN("vcl", "Could not OpenTTFont \"" << aFile.getStr() << "\""); + SAL_WARN("vcl", "Could not OpenTTFont \"" << aFile << "\""); return bSuccess; } |