summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Suo <suokunlong@126.com>2022-12-03 18:43:02 +0800
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-12-03 14:07:03 +0000
commitd423e18de7c48df359d2d2d1b5b8f5cceac4d96a (patch)
tree8b811f3eeaaeea43786185c6d654ae5f16e496c8
parentbbe530a238e68d7338c51532f0f7991ccae8ba17 (diff)
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.grandin@collabora.co.uk>
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.cxx2
-rw-r--r--sdext/source/pdfimport/tree/writertreevisiting.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 8338ba6dbfde..64aca46ce18b 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -878,7 +878,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 cc2cee18eb6a..de44dcf711b4 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