diff --git a/emfio/CppunitTest_emfio_emf.mk b/emfio/CppunitTest_emfio_emf.mk index e8e90d7dddd4..38a1c98250f7 100644 --- a/emfio/CppunitTest_emfio_emf.mk +++ b/emfio/CppunitTest_emfio_emf.mk @@ -41,6 +41,8 @@ $(eval $(call gb_CppunitTest_use_vcl,emfio_emf)) $(eval $(call gb_CppunitTest_use_rdb,emfio_emf,services)) +$(eval $(call gb_CppunitTest_use_more_fonts,emfio_emf)) + $(eval $(call gb_CppunitTest_use_configuration,emfio_emf)) # vim: set noet sw=4 ts=4: diff --git a/emfio/CppunitTest_emfio_wmf.mk b/emfio/CppunitTest_emfio_wmf.mk index a127bdb0af1f..8ab4a9064dba 100644 --- a/emfio/CppunitTest_emfio_wmf.mk +++ b/emfio/CppunitTest_emfio_wmf.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,emfio_wmf,\ vcl \ )) +$(eval $(call gb_CppunitTest_use_more_fonts,emfio_wmf)) $(eval $(call gb_CppunitTest_use_configuration,emfio_wmf)) $(eval $(call gb_CppunitTest_use_sdk_api,emfio_wmf)) $(eval $(call gb_CppunitTest_use_ure,emfio_wmf)) diff --git a/emfio/qa/cppunit/wmf/data/tdf88163-non-placeable.wmf b/emfio/qa/cppunit/wmf/data/tdf88163-non-placeable.wmf index b39514bd1b5c..6d27691f0d2d 100644 Binary files a/emfio/qa/cppunit/wmf/data/tdf88163-non-placeable.wmf and b/emfio/qa/cppunit/wmf/data/tdf88163-non-placeable.wmf differ diff --git a/emfio/qa/cppunit/wmf/data/tdf88163-wrong-font-size.wmf b/emfio/qa/cppunit/wmf/data/tdf88163-wrong-font-size.wmf index edcab8aea635..4902ba18d16b 100644 Binary files a/emfio/qa/cppunit/wmf/data/tdf88163-wrong-font-size.wmf and b/emfio/qa/cppunit/wmf/data/tdf88163-wrong-font-size.wmf differ diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx index db84998523fa..846527b3aa22 100644 --- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx +++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx @@ -117,14 +117,10 @@ void WmfTest::testTdf88163NonPlaceableWmf() // These values come from the fix for tdf#88163 - // Font 'Roman' and its height can vary according to the platform // Fails without the fix - // Linux: With fix: 3136, without fix: ~ 8000 - // Mac: With fix: 3230, without fix: ~ 8000 - // Windows: With fix: 3303, without fix: ~ 8000 + // With fix: 3272, without fix: ~ 8000 auto x = getXPath(pDoc, "/metafile/push[2]/font[1]", "height"); - CPPUNIT_ASSERT_GREATEREQUAL(sal_Int32(3000), x.toInt32()); - CPPUNIT_ASSERT_LESS(sal_Int32(3500), x.toInt32()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3272), x.toInt32()); // Fails without the fix: Expected: 7359, Actual: 7336 assertXPath(pDoc, "/metafile/push[2]/textarray[1]", "x", "7359"); @@ -157,12 +153,9 @@ void WmfTest::testTdf88163PlaceableWmf() // These values come from the fix for tdf#88163 - // Font 'Roman' and its height can vary according to the platform // The fix does not affect the font size - // Linux: 300 - Mac: 309 - Windows: 316 auto x = getXPath(pDoc, "/metafile/push[2]/font[1]", "height"); - CPPUNIT_ASSERT_GREATEREQUAL(sal_Int32(287), x.toInt32()); - CPPUNIT_ASSERT_LESS(sal_Int32(320), x.toInt32()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(313), x.toInt32()); // Fails without the fix: Expected: 1900, Actual: 19818 assertXPath(pDoc, "/metafile", "height", "1900");