sd/qa/unit/data/pptx/tdf144092-tableHeight.pptx |binary
sd/qa/unit/import-tests2.cxx | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4210745f5045958f36dac1c71be7eac3b9cc3f13
Author: Sarper Akdemir <sarper.akdemir.ext...@allotropia.de>
AuthorDate: Fri Oct 20 12:03:25 2023 +0300
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Oct 23 11:56:42 2023 +0200
use Liberation Sans instead of Calibri in the test for tdf#144092
based on Stephan Bergmann's point on:
<https://gerrit.libreoffice.org/c/core/+/138652/comment/bb5fc1a4_75e060c9/>
the font used in the test file was Calibri, which likely was
being replaced with the best approximation on a given system.
Changed that to Liberation Sans which is a font that is bundled
with LibreOffice to improve the test's robustness.
Change-Id: I7ff75baeb9259dea244913ca9d5025948291f1e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158234
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 676e0527d2f31556eccae314fbb12ce204f02ec7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158277
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sd/qa/unit/data/pptx/tdf144092-tableHeight.pptx
b/sd/qa/unit/data/pptx/tdf144092-tableHeight.pptx
index c597abf9a620..949a0561b25c 100644
Binary files a/sd/qa/unit/data/pptx/tdf144092-tableHeight.pptx and
b/sd/qa/unit/data/pptx/tdf144092-tableHeight.pptx differ
diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx
index 525177ba44da..0ca3513ae00c 100644
--- a/sd/qa/unit/import-tests2.cxx
+++ b/sd/qa/unit/import-tests2.cxx
@@ -1771,10 +1771,10 @@ CPPUNIT_TEST_FIXTURE(SdImportTest2,
testTdf144092TableHeight)
uno::Reference<drawing::XShape> xTableShape(getShapeFromPage(0, 0),
uno::UNO_QUERY);
// Without the accompanying fix in place, this test would have failed with:
- // - Expected: 7208
+ // - Expected: 7606
// - Actual : 4595
// i.e. the table height wasn't corrected by expanding less than minimum
sized rows.
- CPPUNIT_ASSERT_EQUAL(sal_Int32(7208), xTableShape->getSize().Height);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(7606), xTableShape->getSize().Height);
}
CPPUNIT_TEST_FIXTURE(SdImportTest2, testTdf89928BlackWhiteThreshold)
