Kaydet (Commit) e0d85694 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Consistently use "vcl.fonts" log area across vcl/unx/generic/fontmanager/

Change-Id: I26fd88c7579e4a7bd1a46ab41fe82f5c9d760ddf
üst 3f1faf10
...@@ -263,7 +263,7 @@ namespace ...@@ -263,7 +263,7 @@ namespace
FcChar8* candidate = elements.begin()->second; FcChar8* candidate = elements.begin()->second;
/* FIXME-BCP47: once fontconfig supports language tags this /* FIXME-BCP47: once fontconfig supports language tags this
* language-territory stuff needs to be changed! */ * language-territory stuff needs to be changed! */
SAL_INFO_IF( !rLangTag.isIsoLocale(), "i18n", "localizedsorter::bestname - not an ISO locale"); SAL_INFO_IF( !rLangTag.isIsoLocale(), "vcl.fonts", "localizedsorter::bestname - not an ISO locale");
OString sLangMatch(OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8)); OString sLangMatch(OUStringToOString(rLangTag.getLanguage().toAsciiLowerCase(), RTL_TEXTENCODING_UTF8));
OString sFullMatch = sLangMatch; OString sFullMatch = sLangMatch;
sFullMatch += OString('-'); sFullMatch += OString('-');
...@@ -675,7 +675,7 @@ void PrintFontManager::addFontconfigDir( const OString& rDirName ) ...@@ -675,7 +675,7 @@ void PrintFontManager::addFontconfigDir( const OString& rDirName )
if( !bCfgOk ) if( !bCfgOk )
fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk ); fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk );
} else { } else {
SAL_INFO("vcl", "cannot open " << aConfFileName); SAL_INFO("vcl.fonts", "cannot open " << aConfFileName);
} }
} }
...@@ -839,7 +839,7 @@ namespace ...@@ -839,7 +839,7 @@ namespace
default: default:
break; break;
} }
SAL_WARN_IF(bIsImpossible, "vcl", "In glyph fallback throwing away the language property of " SAL_WARN_IF(bIsImpossible, "vcl.fonts", "In glyph fallback throwing away the language property of "
<< sLang << " because the detected script for '0x" << sLang << " because the detected script for '0x"
<< OUString::number(currentChar, 16) << OUString::number(currentChar, 16)
<< "' is " << uscript_getName(eScript) << "' is " << uscript_getName(eScript)
...@@ -868,7 +868,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void) ...@@ -868,7 +868,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
} }
catch (const css::uno::Exception& e) catch (const css::uno::Exception& e)
{ {
SAL_INFO("vcl", "InstallFontconfigResources problem, caught " << e); SAL_INFO("vcl.fonts", "InstallFontconfigResources problem, caught " << e);
// Disable this method from now on. It's simply not available on some systems // Disable this method from now on. It's simply not available on some systems
// and leads to an error dialog being shown each time this is called tdf#104883 // and leads to an error dialog being shown each time this is called tdf#104883
std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create() ); std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create() );
...@@ -972,7 +972,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi ...@@ -972,7 +972,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
} }
} }
SAL_WARN_IF(!bRet, "vcl", "no FC_FILE found, falling back to name search"); SAL_WARN_IF(!bRet, "vcl.fonts", "no FC_FILE found, falling back to name search");
if (!bRet) if (!bRet)
{ {
......
...@@ -458,7 +458,7 @@ OUString PrintFontManager::convertSfntName( void* pRecord ) ...@@ -458,7 +458,7 @@ OUString PrintFontManager::convertSfntName( void* pRecord )
default: default:
if (aName.startsWith("Khmer OS")) if (aName.startsWith("Khmer OS"))
eEncoding = RTL_TEXTENCODING_UTF8; eEncoding = RTL_TEXTENCODING_UTF8;
SAL_WARN_IF(eEncoding == RTL_TEXTENCODING_DONTKNOW, "vcl", "Unimplemented mac encoding " << pNameRecord->encodingID << " to unicode conversion for fontname " << aName); SAL_WARN_IF(eEncoding == RTL_TEXTENCODING_DONTKNOW, "vcl.fonts", "Unimplemented mac encoding " << pNameRecord->encodingID << " to unicode conversion for fontname " << aName);
break; break;
} }
if (eEncoding != RTL_TEXTENCODING_DONTKNOW) if (eEncoding != RTL_TEXTENCODING_DONTKNOW)
...@@ -609,7 +609,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const ...@@ -609,7 +609,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const
if( aInfo.usubfamily ) if( aInfo.usubfamily )
pFont->m_aStyleName = OUString( aInfo.usubfamily ); pFont->m_aStyleName = OUString( aInfo.usubfamily );
SAL_WARN_IF( !aInfo.psname, "vcl", "No PostScript name in font:" << aFile ); SAL_WARN_IF( !aInfo.psname, "vcl.fonts", "No PostScript name in font:" << aFile );
pFont->m_aPSName = aInfo.psname ? pFont->m_aPSName = aInfo.psname ?
OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) :
...@@ -693,7 +693,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const ...@@ -693,7 +693,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont ) const
bSuccess = true; bSuccess = true;
} }
else else
SAL_WARN("vcl", "Could not OpenTTFont \"" << aFile << "\""); SAL_WARN("vcl.fonts", "Could not OpenTTFont \"" << aFile << "\"");
return bSuccess; return bSuccess;
} }
...@@ -1004,9 +1004,9 @@ bool PrintFontManager::createFontSubset( ...@@ -1004,9 +1004,9 @@ bool PrintFontManager::createFontSubset(
} }
else else
{ {
SAL_WARN_IF( (pGlyphIds[i] & 0x007f0000), "vcl", "overlong glyph id" ); SAL_WARN_IF( (pGlyphIds[i] & 0x007f0000), "vcl.fonts", "overlong glyph id" );
SAL_WARN_IF( static_cast<int>(pNewEncoding[i]) >= nGlyphs, "vcl", "encoding wrong" ); SAL_WARN_IF( static_cast<int>(pNewEncoding[i]) >= nGlyphs, "vcl.fonts", "encoding wrong" );
SAL_WARN_IF( pEnc[pNewEncoding[i]] != 0 || pGID[pNewEncoding[i]] != 0, "vcl", "duplicate encoded glyph" ); SAL_WARN_IF( pEnc[pNewEncoding[i]] != 0 || pGID[pNewEncoding[i]] != 0, "vcl.fonts", "duplicate encoded glyph" );
pEnc[ pNewEncoding[i] ] = pNewEncoding[i]; pEnc[ pNewEncoding[i] ] = pNewEncoding[i];
pGID[ pNewEncoding[i] ] = static_cast<sal_uInt16>(pGlyphIds[ i ]); pGID[ pNewEncoding[i] ] = static_cast<sal_uInt16>(pGlyphIds[ i ]);
pOldIndex[ pNewEncoding[i] ] = i; pOldIndex[ pNewEncoding[i] ] = i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment