strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the real font used for 'Roman' is arbitrary

Browse source 
the font name isn't a typical semi-standard one so it neither exists nor
has a standard fallback. binary-hack "Roman" to "Arial" which is
conveniently the same length and does have a standard fallback of
"Liberation Sans" which we can add a dependency on via more_fonts

Change-Id: I1d9b8294f67a00a1e5cabe38b71467e66b83aedf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129454
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2022-02-03 16:05:48 +00:00
parent 84b79376d7
commit f995099491
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emfio/CppunitTest_emfio_emf.mk
View file

@ -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:

1
emfio/CppunitTest_emfio_wmf.mk
View file

@ -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))

BIN
emfio/qa/cppunit/wmf/data/tdf88163-non-placeable.wmf
View file

Binary file not shown.

BIN
emfio/qa/cppunit/wmf/data/tdf88163-wrong-font-size.wmf
View file

Binary file not shown.

13
emfio/qa/cppunit/wmf/wmfimporttest.cxx
View file

@ -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");