diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-01-19 20:39:06 +0000 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-01-25 13:55:59 +0000 |
| commit | 55252491dbcf9efda363b50d949ae358cfb6f80b (patch) | |
| tree | 048df3e946e4488fb03379dc91d5902f6b8b5b83 | |
| parent | bd805279bfa1e952fdc8e4de6014ffda8cfdc29c (diff) | |
change test to use Calibri instead of Cambria
because of the Caladea problem
There are sadly now two Caladea fonts with different metrics, see:
https://bugzilla.redhat.com/show_bug.cgi?id=2162532
https://github.com/huertatipografica/Caladea/issues/4
Change-Id: I7080d16ec8aae2bbe60717aea85b980a33340e9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145807
Tested-by: Jenkins
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>
(cherry picked from commit 7a1eb473c01f8c04ad55fd344d2ffad64f064ace)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146087
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx | bin | 34718 -> 35488 bytes | |||
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml3.cxx | 5 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx b/sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx Binary files differindex e8d1938a2308..28672eb4b7f3 100644 --- a/sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx +++ b/sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx diff --git a/sd/qa/unit/export-tests-ooxml3.cxx b/sd/qa/unit/export-tests-ooxml3.cxx index 309709317821..db023bef2592 100644 --- a/sd/qa/unit/export-tests-ooxml3.cxx +++ b/sd/qa/unit/export-tests-ooxml3.cxx @@ -748,14 +748,15 @@ void SdOOXMLExportTest3::testTdf125573_FontWorkScaleX() awt::Rectangle aBoundRectArch; xShapeArchProps->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= aBoundRectArch; // BoundRect is DPI dependent, thus allow some range. - CPPUNIT_ASSERT_LESS(sal_Int32(50), std::abs(aBoundRectArch.Width - 13038)); + // (Without fix Expected less than: 85 Actual : 10432) + CPPUNIT_ASSERT_LESS(sal_Int32(85), std::abs(aBoundRectArch.Width - 13038)); // Error was, that text in shapes of category "Warp" was not scaled to the path. uno::Reference<beans::XPropertySet> xShapeWaveProps(getShapeFromPage(0, 1)); awt::Rectangle aBoundRectWave; xShapeWaveProps->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= aBoundRectWave; // BoundRect is DPI dependent, thus allow some range. - CPPUNIT_ASSERT_LESS(sal_Int32(50), std::abs(aBoundRectWave.Width - 11576)); + CPPUNIT_ASSERT_LESS(sal_Int32(85), std::abs(aBoundRectWave.Width - 11576)); } void SdOOXMLExportTest3::testTdf99497_keepAppearanceOfCircleKind() |