drawinglayer/source/primitive2d/textbreakuphelper.cxx | 2 +- drawinglayer/source/tools/wmfemfhelper.cxx | 2 +- vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 0704f03eca87491f87381a2fa995f1920bb19151 Author: Khaled Hosny <[email protected]> AuthorDate: Tue Oct 21 13:11:52 2025 +0300 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Oct 21 15:32:12 2025 +0200 tdf#168884: Restore missing transparency in EMF files Revert unrelated changes from: commit 1bdf1e2d52a7fae3e1a58ddf15a7657df3d47004 Author: Khaled Hosny <[email protected]> Date: Thu Sep 25 16:33:09 2025 +0300 tdf#168371: Disable ligatures in Impress/Draw with character spacing I added a new parameter to TextSimplePortionPrimitive2D constructor, and rTextFillColor that previously was using the default value had now to be explicitly set, but I should have used COL_TRANSPARENT as that is the default. Change-Id: Ie51e8f3f4c68a9539eb3f6cc77fb1e6cf44f673f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192779 Reviewed-by: Khaled Hosny <[email protected]> Tested-by: Jenkins (cherry picked from commit 1dce54d8fb070d3d4134317612c145a923497bb4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192788 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/drawinglayer/source/primitive2d/textbreakuphelper.cxx b/drawinglayer/source/primitive2d/textbreakuphelper.cxx index 8f3c8eaf22a8..b72093d1a349 100644 --- a/drawinglayer/source/primitive2d/textbreakuphelper.cxx +++ b/drawinglayer/source/primitive2d/textbreakuphelper.cxx @@ -180,7 +180,7 @@ namespace drawinglayer::primitive2d mrSource.getFontAttribute(), mrSource.getLocale(), mrSource.getFontColor(), - mrSource.getTextFillColor(), + COL_TRANSPARENT, mrSource.getLetterSpacing())); } } diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 4dccd6d5e671..e7efa0664c2c 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -1157,7 +1157,7 @@ namespace wmfemfhelper std::move(aFontAttribute), std::move(aLocale), aFontColor, - aFillColor, + COL_TRANSPARENT, rFont.GetFixKerning()); } } diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx index 7587322d5cd0..bddf05c24b11 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx @@ -4192,9 +4192,9 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf145873) int nPageObjectCount = pPdfPage->getObjectCount(); // tdf#145873: Without the fix #1 in place, this test would have failed with - // - Expected: 107 + // - Expected: 66 // - Actual : 3 - CPPUNIT_ASSERT_EQUAL(107, nPageObjectCount); + CPPUNIT_ASSERT_EQUAL(66, nPageObjectCount); auto pObject = pPdfPage->getObject(4); CPPUNIT_ASSERT_MESSAGE("no object", pObject != nullptr);
