svx/source/svdraw/svdpdf.cxx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
New commits: commit 440a09f17ee7019cc94bb7f864a146d374a7a686 Author: Caolán McNamara <[email protected]> AuthorDate: Tue Sep 30 12:22:40 2025 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Thu Oct 2 08:45:23 2025 +0200 If there is no font version, use the cid font version Change-Id: Ia350f768dcb75e5e6f5df79c3d3fe938113c9d04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191681 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index 3ad8a2ca651e..7f1725ed5d97 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -1001,7 +1001,7 @@ static bool toPfaCID(SubSetInfo& rSubSetInfo, const OUString& fileUrl, OUString nameToCIDMapUrl = fileUrl + u".nametocidmap"; OUString toMergedMapUrl = fileUrl + u".tomergedmap"; - OString version, Notice, FullName, FamilyName, CIDFontName, srcFontType; + OString version, Notice, FullName, FamilyName, CIDFontName, CIDFontVersion, srcFontType; FontName = postScriptName.toUtf8(); std::map<sal_Int32, OString> glyphIndexToName; @@ -1029,6 +1029,8 @@ static bool toPfaCID(SubSetInfo& rSubSetInfo, const OUString& fileUrl, { if (extractEntry(sLine, "version", version)) continue; + if (extractEntry(sLine, "cid.CIDFontVersion", CIDFontVersion)) + continue; if (extractEntry(sLine, "Notice", Notice)) continue; if (extractEntry(sLine, "FullName", FullName)) @@ -1098,7 +1100,11 @@ static bool toPfaCID(SubSetInfo& rSubSetInfo, const OUString& fileUrl, } } SAL_INFO("sd.filter", "details are: " << version << Notice << FullName << FamilyName << Weight - << srcFontType << FontName); + << srcFontType << FontName << CIDFontName + << CIDFontVersion); + + if (version.isEmpty()) + version = CIDFontVersion; // Always create cidFontInfo, we will need it if we need to merge fonts OString AdobeCopyright, Trademark;
