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

Re-enable CppunitTest_emfio_wmf for --enable-mergelibs

Browse source 
It had originally been disabled by a037f6338c
"Disable CppunitTest_vcl_wmf_test under --enable-merglibs for now" because "the
problems caused by that test having the vcl objects linked into both the test's
library and the mergedlib (which the test's library links against) are just not
manageable", which is no longer an issue at least since
29cdfa3fc3 "no need to statically link against the
emfio library in the tests".

But the test code apparently uses WinMtfFontStyle, which can thus no longer be
hidden under --enable-mergelibs.

Change-Id: Ie807b19f0cb44408c69d03faca01fabe88239ca0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148493
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2023-03-08 22:56:51 +01:00
parent db73d73c40
commit f194f9dba0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emfio/Module_emfio.mk
View file

@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,emfio,\
$(eval $(call gb_Module_add_check_targets,emfio,\ $(eval $(call gb_Module_add_check_targets,emfio,\
CppunitTest_emfio_emf \ CppunitTest_emfio_emf \
$(if $(MERGELIBS),,CppunitTest_emfio_wmf) \ CppunitTest_emfio_wmf \
)) ))
# vim: set noet ts=4 sw=4: # vim: set noet ts=4 sw=4:

2
emfio/inc/mtftools.hxx
View file

@ -387,7 +387,7 @@ namespace emfio
GDIObj & operator =(GDIObj const &) = default; GDIObj & operator =(GDIObj const &) = default;
}; };
struct UNLESS_MERGELIBS(EMFIO_DLLPUBLIC) WinMtfFontStyle final : GDIObj struct EMFIO_DLLPUBLIC WinMtfFontStyle final : GDIObj
{ {
vcl::Font aFont; vcl::Font aFont;