let toplevel 'make -sr CppunitTest_sw_ooxmlexport' (and friends) work again

Change-Id: I610ae1d3672f76435def025bd8819780df863dbe

8 files changed, 88 insertions, 88 deletions

diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 36fad9b670c9..9422a89e7850 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_odfexport))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_odfexport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfexport, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_odfexport, \
     sw/qa/extras/odfexport/odfexport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_odfexport, \
     comphelper \
     cppu \
     cppuhelper \
@@ -48,26 +48,26 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\
+$(eval $(call gb_CppunitTest_use_externals,sw_odfexport,\
 	boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfexport,\
+$(eval $(call gb_CppunitTest_set_include,sw_odfexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfexport,\
+$(eval $(call gb_CppunitTest_use_api,sw_odfexport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfexport))
+$(eval $(call gb_CppunitTest_use_ure,sw_odfexport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\
+$(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
 	basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -94,10 +94,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfexport,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfexport))
+$(eval $(call gb_CppunitTest_use_configuration,sw_odfexport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfexport))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_odfexport))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfexport))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfexport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index 30c2e4749259..052915029010 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_odfimport))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_odfimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfimport, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_odfimport, \
     sw/qa/extras/odfimport/odfimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_odfimport, \
     comphelper \
     cppu \
     cppuhelper \
@@ -47,26 +47,26 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\
+$(eval $(call gb_CppunitTest_use_externals,sw_odfimport,\
 	boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfimport,\
+$(eval $(call gb_CppunitTest_set_include,sw_odfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
 	-I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfimport,\
+$(eval $(call gb_CppunitTest_use_api,sw_odfimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfimport))
+$(eval $(call gb_CppunitTest_use_ure,sw_odfimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\
+$(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
 	basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -93,10 +93,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport))
+$(eval $(call gb_CppunitTest_use_configuration,sw_odfimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfimport))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_odfimport))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_odfimport))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_odfimport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlexport.mk b/sw/CppunitTest_sw_ooxmlexport.mk
index bc58ee9bef46..0a00da2b2418 100644
--- a/sw/CppunitTest_sw_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_ooxmlexport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ooxmlexport))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlexport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlexport, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlexport, \
     sw/qa/extras/ooxmlexport/ooxmlexport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlexport, \
     comphelper \
     cppu \
 	cppuhelper \
@@ -48,26 +48,26 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\
+$(eval $(call gb_CppunitTest_use_externals,sw_ooxmlexport,\
 	boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlexport,\
+$(eval $(call gb_CppunitTest_set_include,sw_ooxmlexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
 	-I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmlexport,\
+$(eval $(call gb_CppunitTest_use_api,sw_ooxmlexport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmlexport))
+$(eval $(call gb_CppunitTest_use_ure,sw_ooxmlexport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlexport,\
+$(eval $(call gb_CppunitTest_use_components,sw_ooxmlexport,\
 	basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -98,10 +98,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlexport,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlexport))
+$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlexport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlexport))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ooxmlexport))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlexport))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlexport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 016aba3b8f15..25c6cac65da5 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ooxmlimport))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlimport, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlimport, \
     sw/qa/extras/ooxmlimport/ooxmlimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlimport, \
     comphelper \
     cppu \
     cppuhelper \
@@ -46,26 +46,26 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\
+$(eval $(call gb_CppunitTest_use_externals,sw_ooxmlimport,\
 	boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlimport,\
+$(eval $(call gb_CppunitTest_set_include,sw_ooxmlimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmlimport,\
+$(eval $(call gb_CppunitTest_use_api,sw_ooxmlimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmlimport))
+$(eval $(call gb_CppunitTest_use_ure,sw_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\
+$(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
 	basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -95,10 +95,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlimport))
+$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlimport))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ooxmlimport))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlimport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk
index 6017d1464c9c..fa86c2075097 100644
--- a/sw/CppunitTest_sw_rtfexport.mk
+++ b/sw/CppunitTest_sw_rtfexport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_rtfexport))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_rtfexport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfexport, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_rtfexport, \
     sw/qa/extras/rtfexport/rtfexport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_rtfexport, \
     comphelper \
     cppu \
 	cppuhelper \
@@ -47,26 +47,26 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\
+$(eval $(call gb_CppunitTest_use_externals,sw_rtfexport,\
 	boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtfexport,\
+$(eval $(call gb_CppunitTest_set_include,sw_rtfexport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
 	-I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtfexport,\
+$(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfexport))
+$(eval $(call gb_CppunitTest_use_ure,sw_rtfexport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfexport,\
+$(eval $(call gb_CppunitTest_use_components,sw_rtfexport,\
 	basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -95,10 +95,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfexport,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfexport))
+$(eval $(call gb_CppunitTest_use_configuration,sw_rtfexport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfexport))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_rtfexport))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfexport))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfexport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk
index 88fad7eec5f0..783aa30e082c 100644
--- a/sw/CppunitTest_sw_rtfimport.mk
+++ b/sw/CppunitTest_sw_rtfimport.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_rtfimport))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_rtfimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfimport, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_rtfimport, \
     sw/qa/extras/rtfimport/rtfimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_rtfimport, \
     comphelper \
     cppu \
     cppuhelper \
@@ -49,26 +49,26 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\
+$(eval $(call gb_CppunitTest_use_externals,sw_rtfimport,\
 	boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtfimport,\
+$(eval $(call gb_CppunitTest_set_include,sw_rtfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtfimport,\
+$(eval $(call gb_CppunitTest_use_api,sw_rtfimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfimport))
+$(eval $(call gb_CppunitTest_use_ure,sw_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfimport,\
+$(eval $(call gb_CppunitTest_use_components,sw_rtfimport,\
 	basic/util/sb \
 	comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -95,10 +95,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfimport,\
 	writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfimport))
+$(eval $(call gb_CppunitTest_use_configuration,sw_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfimport))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_rtfimport))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_rtfimport))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 9513b8f441e4..70a8b4dec77d 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ww8export))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_ww8export))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8export, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_ww8export, \
     sw/qa/extras/ww8export/ww8export \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_ww8export, \
     comphelper \
     cppu \
     cppuhelper \
@@ -48,26 +48,26 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\
+$(eval $(call gb_CppunitTest_use_externals,sw_ww8export,\
 	boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8export,\
+$(eval $(call gb_CppunitTest_set_include,sw_ww8export,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
 	-I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8export,\
+$(eval $(call gb_CppunitTest_use_api,sw_ww8export,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8export))
+$(eval $(call gb_CppunitTest_use_ure,sw_ww8export))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8export,\
+$(eval $(call gb_CppunitTest_use_components,sw_ww8export,\
     basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -97,10 +97,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8export,\
     xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8export))
+$(eval $(call gb_CppunitTest_use_configuration,sw_ww8export))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8export))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ww8export))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8export))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8export))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_ww8import.mk b/sw/CppunitTest_sw_ww8import.mk
index cb2031f905f1..b1a0957a91f3 100644
--- a/sw/CppunitTest_sw_ww8import.mk
+++ b/sw/CppunitTest_sw_ww8import.mk
@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ww8import))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_ww8import))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8import, \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_ww8import, \
     sw/qa/extras/ww8import/ww8import \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_ww8import, \
     comphelper \
     cppu \
     cppuhelper \
@@ -45,26 +45,26 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\
+$(eval $(call gb_CppunitTest_use_externals,sw_ww8import,\
 	boost_headers \
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8import,\
+$(eval $(call gb_CppunitTest_set_include,sw_ww8import,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8import,\
+$(eval $(call gb_CppunitTest_use_api,sw_ww8import,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8import))
+$(eval $(call gb_CppunitTest_use_ure,sw_ww8import))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8import,\
+$(eval $(call gb_CppunitTest_use_components,sw_ww8import,\
 	basic/util/sb \
     comphelper/util/comphelp \
     configmgr/source/configmgr \
@@ -89,10 +89,10 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8import,\
     $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import))
+$(eval $(call gb_CppunitTest_use_configuration,sw_ww8import))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8import))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_ww8import))
 
-$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_subsequent_ww8import))
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ww8import))
 
 # vim: set noet sw=4 ts=4: