diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-03-08 22:56:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-03-09 07:05:04 +0000 |
| commit | f194f9dba0aee30de9d5701f2ff0ce60c785131d (patch) | |
| tree | 684481ffaa1bbebf32e64aeb467d5d9b5fbc9ff2 /emfio | |
| parent | db73d73c4031c20cede546e00b2fc34d673f3069 (diff) | |
Re-enable CppunitTest_emfio_wmf for --enable-mergelibs
It had originally been disabled by a037f6338c19e16bcbc0674214666a786872c59d
"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
29cdfa3fc337381e2529eaac2a551137ee8a1aaa "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>
Diffstat (limited to 'emfio')
| -rw-r--r-- | emfio/Module_emfio.mk | 2 | ||||
| -rw-r--r-- | emfio/inc/mtftools.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/emfio/Module_emfio.mk b/emfio/Module_emfio.mk index 96b69d1cbe86..1ea9db2bb15a 100644 --- a/emfio/Module_emfio.mk +++ b/emfio/Module_emfio.mk @@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,emfio,\ $(eval $(call gb_Module_add_check_targets,emfio,\ CppunitTest_emfio_emf \ - $(if $(MERGELIBS),,CppunitTest_emfio_wmf) \ + CppunitTest_emfio_wmf \ )) # vim: set noet ts=4 sw=4: diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index f7a318f39d55..26e2d8cca088 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -387,7 +387,7 @@ namespace emfio GDIObj & operator =(GDIObj const &) = default; }; - struct UNLESS_MERGELIBS(EMFIO_DLLPUBLIC) WinMtfFontStyle final : GDIObj + struct EMFIO_DLLPUBLIC WinMtfFontStyle final : GDIObj { vcl::Font aFont; |