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

[Kevin Suo (via logerrit)]

 sdext/source/pdfimport/tree/drawtreevisiting.cxx   |    2 +-
 sdext/source/pdfimport/tree/writertreevisiting.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c8f9e93d421207d0b48a80f003ba553b95dc3a98
Author:     Kevin Suo <suokunl...@126.com>
AuthorDate: Sat Dec 3 18:43:02 2022 +0800
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Dec 3 16:12:18 2022 +0000

    tdf#147246 sdext.pdfimport: "font-family-asia" -> "font-family-asian"
    
    This was a typo which causes the asian font in pdf (e.g. Chinese)
    always shown as the system default font on pdfimport.
    
    Change-Id: Ic118f8585fb40dfc4bc5bc12651da95bc7961ae4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143607
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit d423e18de7c48df359d2d2d1b5b8f5cceac4d96a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143578
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx 
b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index b19140a0beb9..95e2ce98566f 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -869,7 +869,7 @@ void DrawXmlFinalizer::visit( TextElement& elem, const 
std::list< std::unique_pt
     // TODO: tdf#143095: use system font name rather than PSName
     SAL_INFO("sdext.pdfimport", "The font used in xml is: " << 
rFont.familyName);
     aFontProps[ "fo:font-family" ] = rFont.familyName;
-    aFontProps[ "style:font-family-asia" ] = rFont.familyName;
+    aFontProps[ "style:font-family-asian" ] = rFont.familyName;
     aFontProps[ "style:font-family-complex" ] = rFont.familyName;
 
     // bold
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx 
b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index cb312bf50d22..52f45ed577a3 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -976,7 +976,7 @@ void WriterXmlFinalizer::visit( TextElement& elem, const 
std::list< std::unique_
     // TODO: tdf#143095: use system font name rather than PSName
     SAL_INFO("sdext.pdfimport", "The font used in xml is: " << 
rFont.familyName);
     aFontProps[ "fo:font-family" ] = rFont.familyName;
-    aFontProps[ "style:font-family-asia" ] = rFont.familyName;
+    aFontProps[ "style:font-family-asian" ] = rFont.familyName;
     aFontProps[ "style:font-family-complex" ] = rFont.familyName;
 
     // bold