[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sdext/source

[Kevin Suo (via logerrit)]

 sdext/source/pdfimport/wrapper/wrapper.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 5aa8378eab3a05fdeee2cbe1056836dee4207b6e
Author:     Kevin Suo <suokunl...@126.com>
AuthorDate: Sat Dec 3 19:54:59 2022 +0800
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Dec 5 01:06:37 2022 +0000

    tdf#147246 sdext: font name returned by font descriptor may be...
    
    ... e.g. "NotoSerifCJKjp-Regular-VKana".
    
    Change-Id: I9818579c7678b0dad5ec2d2217ae59d573de88b4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143609
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit 00bf67a99dcdb1549401f0b656e872e5c9762dc5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143582
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 1e096ccbc11d..5d2a2c0b6892 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -630,6 +630,10 @@ void LineParser::readFont()
                 aResult.familyName = aResult.familyName.copy(7, 
aResult.familyName.getLength() - 7);
                 parseFontFamilyName(aResult);
             }
+            if (aResult.familyName.endsWithIgnoreAsciiCase("-VKana"))
+            {
+                parseFontFamilyName(aResult);
+            }
 
             // Font weight
             if (aFontReadResult.GetWeight() == WEIGHT_THIN)