diff options
| author | Tor Lillqvist <tml@collabora.com> | 2022-03-09 11:33:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2022-04-13 12:54:04 +0200 |
| commit | 5de22d1e559cd0f1f5fa4e247f0ce153710fbeab (patch) | |
| tree | cc66f4a16c0060868d37590593c77dda43db2d08 /vcl/unx | |
| parent | 64c61aeb6be78bcfe458e72054bcea4792eb40e0 (diff) | |
Handle "addfont" from Collabora Online
We use the AddTempDevFont() API to add a new font. Sadly there is no
corresponding way to remove such a temporarily added font.
Change-Id: I6fe61919daa5af29e964cec1caf7293aefa8ea4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132948
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 193b98f9ef94..39fee3853dce 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -105,12 +105,16 @@ bool FreetypeFontFile::Map() const char* pFileName = maNativeFileName.getStr(); int nFile = open( pFileName, O_RDONLY ); if( nFile < 0 ) + { + SAL_WARN("vcl.unx.freetype", "open('" << maNativeFileName << "') failed: " << strerror(errno)); return false; + } struct stat aStat; int nRet = fstat( nFile, &aStat ); if (nRet < 0) { + SAL_WARN("vcl.unx.freetype", "fstat on '" << maNativeFileName << "' failed: " << strerror(errno)); close (nFile); return false; } @@ -118,7 +122,10 @@ bool FreetypeFontFile::Map() mpFileMap = static_cast<unsigned char*>( mmap( nullptr, mnFileSize, PROT_READ, MAP_SHARED, nFile, 0 )); if( mpFileMap == MAP_FAILED ) + { + SAL_WARN("vcl.unx.freetype", "mmap of '" << maNativeFileName << "' failed: " << strerror(errno)); mpFileMap = nullptr; + } close( nFile ); } |