convert test helper library to dynamic

Change-Id: I5992cc7ac9ffb3974fa49bb7feec4b0212032386

10 files changed, 49 insertions, 26 deletions

diff --git a/writerperfect/CppunitTest_writerperfect_calc.mk b/writerperfect/CppunitTest_writerperfect_calc.mk
index c7a8327c397a..9093396b9c2f 100644
--- a/writerperfect/CppunitTest_writerperfect_calc.mk
+++ b/writerperfect/CppunitTest_writerperfect_calc.mk
@@ -24,13 +24,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_calc,\
 	tl \
 	ucbhelper \
 	unotest \
+	wpftqahelper \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_calc,\
-	writerperfect_filtertestbase \
-))
-
 $(eval $(call gb_CppunitTest_use_ure,writerperfect_calc))
 $(eval $(call gb_CppunitTest_use_vcl,writerperfect_calc))
 
diff --git a/writerperfect/CppunitTest_writerperfect_draw.mk b/writerperfect/CppunitTest_writerperfect_draw.mk
index bd7a582d0d15..c614805d7c12 100644
--- a/writerperfect/CppunitTest_writerperfect_draw.mk
+++ b/writerperfect/CppunitTest_writerperfect_draw.mk
@@ -24,13 +24,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_draw,\
 	tl \
 	ucbhelper \
 	unotest \
+	wpftqahelper \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_draw,\
-	writerperfect_filtertestbase \
-))
-
 $(eval $(call gb_CppunitTest_use_ure,writerperfect_draw))
 $(eval $(call gb_CppunitTest_use_vcl,writerperfect_draw))
 
diff --git a/writerperfect/CppunitTest_writerperfect_impress.mk b/writerperfect/CppunitTest_writerperfect_impress.mk
index 352da2bee3f6..dea8b38f848c 100644
--- a/writerperfect/CppunitTest_writerperfect_impress.mk
+++ b/writerperfect/CppunitTest_writerperfect_impress.mk
@@ -24,13 +24,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_impress,\
 	tl \
 	ucbhelper \
 	unotest \
+	wpftqahelper \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_impress,\
-	writerperfect_filtertestbase \
-))
-
 $(eval $(call gb_CppunitTest_use_ure,writerperfect_impress))
 $(eval $(call gb_CppunitTest_use_vcl,writerperfect_impress))
 
diff --git a/writerperfect/CppunitTest_writerperfect_writer.mk b/writerperfect/CppunitTest_writerperfect_writer.mk
index 3d20725fa344..6e7aa5ef9602 100644
--- a/writerperfect/CppunitTest_writerperfect_writer.mk
+++ b/writerperfect/CppunitTest_writerperfect_writer.mk
@@ -24,13 +24,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerperfect_writer,\
 	tl \
 	ucbhelper \
 	unotest \
+	wpftqahelper \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_static_libraries,writerperfect_writer,\
-	writerperfect_filtertestbase \
-))
-
 $(eval $(call gb_CppunitTest_use_ure,writerperfect_writer))
 $(eval $(call gb_CppunitTest_use_vcl,writerperfect_writer))
 
diff --git a/writerperfect/StaticLibrary_writerperfect_filtertestbase.mk b/writerperfect/Library_wpftqahelper.mk
index 8dec6fcfb734..aefd206c7632 100644
--- a/writerperfect/StaticLibrary_writerperfect_filtertestbase.mk
+++ b/writerperfect/Library_wpftqahelper.mk
@@ -7,28 +7,33 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect_filtertestbase))
+$(eval $(call gb_Library_Library,wpftqahelper))
 
-$(eval $(call gb_StaticLibrary_set_include,writerperfect_filtertestbase,\
+$(eval $(call gb_Library_set_include,wpftqahelper,\
     -I$(SRCDIR)/writerperfect/qa/unit \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_StaticLibrary_use_externals,writerperfect_filtertestbase,\
+$(eval $(call gb_Library_add_defs,wpftqahelper,\
+	-DWPFTQAHELPER_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_use_externals,wpftqahelper,\
 	boost_headers \
     cppunit \
 ))
 
-$(eval $(call gb_StaticLibrary_use_sdk_api,writerperfect_filtertestbase))
+$(eval $(call gb_Library_use_sdk_api,wpftqahelper))
 
-$(eval $(call gb_StaticLibrary_use_libraries,writerperfect_filtertestbase,\
+$(eval $(call gb_Library_use_libraries,wpftqahelper,\
     cppu \
     sal \
     test \
+    ucbhelper \
     unotest \
 ))
 
-$(eval $(call gb_StaticLibrary_add_exception_objects,writerperfect_filtertestbase,\
+$(eval $(call gb_Library_add_exception_objects,wpftqahelper,\
     writerperfect/qa/unit/WpftFilterFixture \
     writerperfect/qa/unit/WpftFilterTestBase \
     writerperfect/qa/unit/WpftLoader \
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index c6a3b042ec4d..eda54bb63aa4 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
 	CppunitTest_writerperfect_draw \
 	CppunitTest_writerperfect_impress \
 	CppunitTest_writerperfect_writer \
-	StaticLibrary_writerperfect_filtertestbase \
+	Library_wpftqahelper \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/qa/unit/WpftFilterFixture.hxx b/writerperfect/qa/unit/WpftFilterFixture.hxx
index 4e45a3845220..fe8acc2a0133 100644
--- a/writerperfect/qa/unit/WpftFilterFixture.hxx
+++ b/writerperfect/qa/unit/WpftFilterFixture.hxx
@@ -12,6 +12,8 @@
 
 #include "config_writerperfect.h"
 
+#include "wpftqahelperdllapi.h"
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -63,7 +65,7 @@ namespace writerperfect
 namespace test
 {
 
-class WpftFilterFixture : public ::test::BootstrapFixture
+class WPFTQAHELPER_DLLPUBLIC WpftFilterFixture : public ::test::BootstrapFixture
 {
 public:
     virtual void setUp() override;
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.hxx b/writerperfect/qa/unit/WpftFilterTestBase.hxx
index 7042daaadf47..34aa728eaa61 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.hxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.hxx
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_WRITERPERFECT_QA_UNIT_WPFTFILTERTESTBASE_HXX
 #define INCLUDED_WRITERPERFECT_QA_UNIT_WPFTFILTERTESTBASE_HXX
 
+#include "wpftqahelperdllapi.h"
+
 #include <unordered_map>
 
 #include <com/sun/star/uno/Reference.hxx>
@@ -41,7 +43,7 @@ namespace test
 
 typedef std::unordered_map<rtl::OUString, bool, rtl::OUStringHash> WpftOptionalMap_t;
 
-class WpftFilterTestBase
+class WPFTQAHELPER_DLLPUBLIC WpftFilterTestBase
     : public ::test::FiltersTest
     , public WpftFilterFixture
 {
diff --git a/writerperfect/qa/unit/WpftLoader.hxx b/writerperfect/qa/unit/WpftLoader.hxx
index a854a531d5db..97f2987ba548 100644
--- a/writerperfect/qa/unit/WpftLoader.hxx
+++ b/writerperfect/qa/unit/WpftLoader.hxx
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_WRITERPERFECT_QA_UNIT_WPFTLOADER_HXX
 #define INCLUDED_WRITERPERFECT_QA_UNIT_WPFTLOADER_HXX
 
+#include "wpftqahelperdllapi.h"
+
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -55,7 +57,7 @@ namespace writerperfect
 namespace test
 {
 
-class WpftLoader
+class WPFTQAHELPER_DLLPUBLIC WpftLoader
 {
 public:
     WpftLoader(
diff --git a/writerperfect/qa/unit/wpftqahelperdllapi.h b/writerperfect/qa/unit/wpftqahelperdllapi.h
new file mode 100644
index 000000000000..9f19a29729c2
--- /dev/null
+++ b/writerperfect/qa/unit/wpftqahelperdllapi.h
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_WRITERPERFECT_QA_UNIT_WPFTQAHELPERDLLAPI_H
+#define INCLUDED_WRITERPERFECT_QA_UNIT_WPFTQAHELPERDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined(WPFTQAHELPER_DLLIMPLEMENTATION)
+#define WPFTQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define WPFTQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define WPFTQAHELPER_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */