diff options
| -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; |