sd/qa/unit/export-tests.cxx | 5 +++++ xmloff/source/draw/sdxmlexp.cxx | 6 ++++++ 2 files changed, 11 insertions(+)
New commits: commit ea39440f78b9370b67508280f1b93810acec10fc Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 14 19:40:59 2025 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Oct 17 08:55:46 2025 +0200 always output the embed fonts of decomposed pdf Change-Id: I00659f07a52e9d7ca87a6b89b453bb730c7ff001 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192447 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 50f3d82ae97c..651eaa406c90 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -1032,6 +1032,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdf) loadFromFile(u"pdf/sample.pdf"); setFilterOptions("{\"DecomposePDF\":{\"type\":\"boolean\",\"value\":\"true\"}}"); + setImportFilterName(u"OpenDocument Drawing Flat XML"_ustr); saveAndReload(u"OpenDocument Drawing Flat XML"_ustr); const SdrPage* pPage = GetPage(1); @@ -1054,6 +1055,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfTextPos) loadFromFile(u"pdf/textheight1.pdf"); setFilterOptions("{\"DecomposePDF\":{\"type\":\"boolean\",\"value\":\"true\"}}"); + setImportFilterName(u"OpenDocument Drawing Flat XML"_ustr); saveAndReload(u"OpenDocument Drawing Flat XML"_ustr); xmlDocUniquePtr pXml = parseLayout(); @@ -1075,6 +1077,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfFont) loadFromFile(u"pdf/differentfonts.pdf"); setFilterOptions("{\"DecomposePDF\":{\"type\":\"boolean\",\"value\":\"true\"}}"); + setImportFilterName(u"OpenDocument Drawing Flat XML"_ustr); saveAndReload(u"OpenDocument Drawing Flat XML"_ustr); xmlDocUniquePtr pXml = parseLayout(); @@ -1137,6 +1140,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfGrayscaleImageUnderInvisibleTe loadFromFile(u"pdf/GrayscaleImageUnderInvisibleTest.pdf"); setFilterOptions("{\"DecomposePDF\":{\"type\":\"boolean\",\"value\":\"true\"}}"); + setImportFilterName(u"OpenDocument Drawing Flat XML"_ustr); saveAndReload(u"OpenDocument Drawing Flat XML"_ustr); uno::Reference<drawing::XShapes> xGroupShape(getShapeFromPage(0, 0), uno::UNO_QUERY); @@ -1183,6 +1187,7 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testExplodedPdfMissingFontVersion) loadFromFile(u"pdf/ErrareHumanumEst.pdf"); setFilterOptions("{\"DecomposePDF\":{\"type\":\"boolean\",\"value\":\"true\"}}"); + setImportFilterName(u"OpenDocument Drawing Flat XML"_ustr); saveAndReload(u"OpenDocument Drawing Flat XML"_ustr); const SdrPage* pPage = GetPage(1); diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 3d9a7c9b0297..0821e97e680d 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -2803,6 +2803,12 @@ XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool() // gallery elements may not support com.sun.star.document.Settings so throws from createInstance } + if (decomposePDF()) + { + mbEmbedFonts = true; + mbEmbedUsedOnly = true; + } + XMLFontAutoStylePool* pPool = new XMLFontAutoStylePool(*this); pPool->addModelFonts(Reference<beans::XPropertySet>(GetModel(), UNO_QUERY));
