tdf#143959 sdext.pdfimport: fix font name with subtag

as returned by the font descriptor when reading the font file.

Change-Id: I376b887e6356e765f669b41c43776f78f94c3623
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120815
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 9 insertions, 0 deletions

diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 7cf30241c5ee..2efdab6f8553 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -584,6 +584,15 @@ void LineParser::readFont()
                 if (!aFontDescriptor.Name.isEmpty())
                 {
                     aResult.familyName = aFontDescriptor.Name;
+                    // tdf#143959: there are cases when the family name returned by font descriptor
+                    // is like "AAAAAA+TimesNewRoman,Bold". In this case, use the font name
+                    // determined by parseFontFamilyName instead, but still determine the font
+                    // attributes (bold italic etc) from the font descriptor.
+                    if (aResult.familyName.getLength() > 7 and aResult.familyName.indexOf(u"+", 6) == 6)
+                    {
+                        aResult.familyName = aResult.familyName.copy(7, aResult.familyName.getLength() - 7);
+                        parseFontFamilyName(aResult);
+                    }
                     aResult.isBold = (aFontDescriptor.Weight > 100.0);
                     aResult.isItalic = (aFontDescriptor.Slant == awt::FontSlant_OBLIQUE ||
                                         aFontDescriptor.Slant == awt::FontSlant_ITALIC);