vcl/unx/generic/fontmanager/fontconfig.cxx | 10 +++++-----
vcl/unx/generic/fontmanager/fontmanager.cxx | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit e0d856947af9b29ed9cd0df6e59c384e27f96c0b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri May 18 09:55:57 2018 +0200
Consistently use "vcl.fonts" log area across vcl/unx/generic/fontmanager/
Change-Id: I26fd88c7579e4a7bd1a46ab41fe82f5c9d760ddf
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 3f9d39021175..e70cb6d067af 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -263,7 +263,7 @@ namespace
FcChar8* candidate = elements.begin()->second;
/* FIXME-BCP47: once fontconfig supports language tags this
* 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 sFullMatch = sLangMatch;
sFullMatch += OString('-');
@@ -675,7 +675,7 @@ void PrintFontManager::addFontconfigDir( const OString&
rDirName )
if( !bCfgOk )
fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n",
aConfFileName.getStr(), bCfgOk );
} else {
- SAL_INFO("vcl", "cannot open " << aConfFileName);
+ SAL_INFO("vcl.fonts", "cannot open " << aConfFileName);
}
}
@@ -839,7 +839,7 @@ namespace
default:
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"
<< OUString::number(currentChar, 16)
<< "' is " << uscript_getName(eScript)
@@ -868,7 +868,7 @@ IMPL_LINK_NOARG(PrintFontManager,
autoInstallFontLangSupport, Timer *, void)
}
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
// and leads to an error dialog being shown each time this is called
tdf#104883
std::shared_ptr<comphelper::ConfigurationChanges> batch(
comphelper::ConfigurationChanges::create() );
@@ -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)
{
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 3b54aa3845a5..fc19a52b9022 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -458,7 +458,7 @@ OUString PrintFontManager::convertSfntName( void* pRecord )
default:
if (aName.startsWith("Khmer OS"))
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;
}
if (eEncoding != RTL_TEXTENCODING_DONTKNOW)
@@ -609,7 +609,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 );
+ SAL_WARN_IF( !aInfo.psname, "vcl.fonts", "No PostScript name in font:"
<< aFile );
pFont->m_aPSName = aInfo.psname ?
OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding)
:
@@ -693,7 +693,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont* pFont )
const
bSuccess = true;
}
else
- SAL_WARN("vcl", "Could not OpenTTFont \"" << aFile << "\"");
+ SAL_WARN("vcl.fonts", "Could not OpenTTFont \"" << aFile << "\"");
return bSuccess;
}
@@ -1004,9 +1004,9 @@ bool PrintFontManager::createFontSubset(
}
else
{
- SAL_WARN_IF( (pGlyphIds[i] & 0x007f0000), "vcl", "overlong glyph
id" );
- SAL_WARN_IF( static_cast<int>(pNewEncoding[i]) >= nGlyphs, "vcl",
"encoding wrong" );
- SAL_WARN_IF( pEnc[pNewEncoding[i]] != 0 || pGID[pNewEncoding[i]]
!= 0, "vcl", "duplicate encoded glyph" );
+ SAL_WARN_IF( (pGlyphIds[i] & 0x007f0000), "vcl.fonts", "overlong
glyph id" );
+ 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.fonts", "duplicate encoded glyph" );
pEnc[ pNewEncoding[i] ] = pNewEncoding[i];
pGID[ pNewEncoding[i] ] = static_cast<sal_uInt16>(pGlyphIds[ i ]);
pOldIndex[ pNewEncoding[i] ] = i;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
