vcl/unx/generic/fontmanager/fontmanager.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 842c2f1d4725b654f141b2b1695a174afc9b02b4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Mar 7 20:31:58 2023 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Mar 8 11:58:24 2023 +0000
Related: tdf#152278 distinguish likely-invalid vs unimplemented in warning
Change-Id: Iafe54afcc16e255e7fb82e14710485fa22e2e491
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148445
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 2cd432aaf98a..dc8feaa6d0b3 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -402,12 +402,14 @@ OUString PrintFontManager::convertSfntName( const
NameRecord& rNameRecord )
eEncoding = RTL_TEXTENCODING_UTF8;
break;
default:
- if (o3tl::starts_with(aName, "Khmer OS") ||
- o3tl::starts_with(aName, "YoavKtav Black")) // tdf#152278
+ if (o3tl::starts_with(aName, "Khmer OS") || // encoding '20'
(Khmer) isn't implemented
+ o3tl::starts_with(aName, "YoavKtav")) // tdf#152278
{
eEncoding = RTL_TEXTENCODING_UTF8;
}
- SAL_WARN_IF(eEncoding == RTL_TEXTENCODING_DONTKNOW,
"vcl.fonts", "Unimplemented mac encoding " << rNameRecord.encodingID << " to
unicode conversion for fontname " << aName);
+ SAL_WARN_IF(eEncoding == RTL_TEXTENCODING_DONTKNOW,
"vcl.fonts", "mac encoding " <<
+ rNameRecord.encodingID << " in font '" << aName <<
"'" <<
+ (rNameRecord.encodingID > 32 ? " is invalid" : "
has unimplemented conversion"));
break;
}
if (eEncoding != RTL_TEXTENCODING_DONTKNOW)
