[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/fontmanager/fontmanager.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4b16ed30c345bbce7f579acf556db29a4d95b80a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Mar 7 12:16:59 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Mar 7 16:23:58 2023 +0000

    tdf#152278 a YoavKtav Black font reported as claiming its name is in 0x4800 
encoding
    
    Change-Id: Ie1f190cd4e550a21b5614d565b03422332594ede
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148417
    Tested-by: Caolán McNamara <caol...@redhat.com>
    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 e9e2907091f9..2cd432aaf98a 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -402,8 +402,11 @@ OUString PrintFontManager::convertSfntName( const 
NameRecord& rNameRecord )
                 eEncoding = RTL_TEXTENCODING_UTF8;
                 break;
             default:
-                if (o3tl::starts_with(aName, "Khmer OS"))
+                if (o3tl::starts_with(aName, "Khmer OS") ||
+                    o3tl::starts_with(aName, "YoavKtav Black")) // 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);
                 break;
         }