sw/qa/extras: rename import tests from *tok to *import

odfimport sounds much better as there's no such thing as "odftok"

Change-Id: I0a8684377c257f2c40a2e8255f62343d4ff2272a

sw/CppunitTest_sw_subsequent_odfimport.mk

@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_odftok))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_odfimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odftok, \
-    sw/qa/extras/odftok/odftok \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_odfimport, \
+    sw/qa/extras/odfimport/odfimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odftok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
     cppu \
     cppuhelper \
     sal \
@@ -46,24 +46,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odftok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_odfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_odfimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odftok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_odfimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_odfimport,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
@@ -86,11 +86,11 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_odftok,\
     xmlhelp/util/ucpchelp1 \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odftok))
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_odfimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odftok))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_odfimport))
 
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odftok,\
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_odfimport,\
 	$(OUTDIR)/unittest/registry \
 ))
 

sw/CppunitTest_sw_subsequent_ooxmlimport.mk

@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmltok, \
-    sw/qa/extras/ooxmltok/ooxmltok \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ooxmlimport, \
+    sw/qa/extras/ooxmlimport/ooxmlimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
     cppu \
     cppuhelper \
     sal \
@@ -45,24 +45,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmltok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ooxmlimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ooxmlimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmlimport,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
@@ -88,11 +88,11 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ooxmltok,\
     writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmltok))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ooxmlimport))
 
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmltok,\
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ooxmlimport,\
 	$(OUTDIR)/unittest/registry \
 ))
 

sw/CppunitTest_sw_subsequent_rtfimport.mk

@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_rtfimport))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtftok, \
-    sw/qa/extras/rtftok/rtftok \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_rtfimport, \
+    sw/qa/extras/rtfimport/rtfimport \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
     cppu \
     cppuhelper \
     sal \
@@ -46,24 +46,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtftok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_rtfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_rtfimport,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtfimport,\
 	comphelper/util/comphelp \
     configmgr/source/configmgr \
     fileaccess/source/fileacc \
@@ -84,11 +84,11 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_rtftok,\
 	writerfilter/util/writerfilter \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtftok))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_rtfimport))
 
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtftok,\
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_rtfimport,\
 	$(OUTDIR)/unittest/registry \
 ))
 

sw/CppunitTest_sw_subsequent_ww8import.mk

@@ -28,13 +28,13 @@
 # instead of those above.
 #*************************************************************************
 
-$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ww8tok))
+$(eval $(call gb_CppunitTest_CppunitTest,sw_subsequent_ww8import))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8tok, \
-    sw/qa/extras/ww8tok/ww8tok \
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_subsequent_ww8import, \
+    sw/qa/extras/ww8import/ww8import \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8tok, \
+$(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
     cppu \
     cppuhelper \
     sal \
@@ -44,24 +44,24 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8tok, \
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\
     libxml2 \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_set_include,sw_subsequent_ww8import,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_use_api,sw_subsequent_ww8import,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8tok))
+$(eval $(call gb_CppunitTest_use_ure,sw_subsequent_ww8import))
 
-$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8import,\
     comphelper/util/comphelp \
     configmgr/source/configmgr \
     dbaccess/util/dba \
@@ -85,11 +85,11 @@ $(eval $(call gb_CppunitTest_use_components,sw_subsequent_ww8tok,\
         xmlhelp/util/ucpchelp1) \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8tok))
+$(eval $(call gb_CppunitTest_use_configuration,sw_subsequent_ww8import))
 
-$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8tok))
+$(eval $(call gb_CppunitTest_use_filter_configuration,sw_subsequent_ww8import))
 
-$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8tok,\
+$(eval $(call gb_CppunitTest_use_extra_configuration,sw_subsequent_ww8import,\
 	$(OUTDIR)/unittest/registry \
 ))
 

sw/Module_sw.mk

@@ -55,12 +55,12 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_filters_test \
     CppunitTest_sw_macros_test \
     CppunitTest_sw_subsequent_ooxmlexport \
-    CppunitTest_sw_subsequent_ooxmltok \
+    CppunitTest_sw_subsequent_ooxmlimport \
     CppunitTest_sw_subsequent_ww8export \
-    CppunitTest_sw_subsequent_ww8tok \
+    CppunitTest_sw_subsequent_ww8import \
     CppunitTest_sw_subsequent_rtfexport \
-    CppunitTest_sw_subsequent_rtftok \
-    CppunitTest_sw_subsequent_odftok \
+    CppunitTest_sw_subsequent_rtfimport \
+    CppunitTest_sw_subsequent_odfimport \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\

sw/qa/extras/odfimport/odfimport.cxx

@@ -49,7 +49,7 @@ private:
 
 void Test::load(const OUString& rFilename)
 {
-    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/odftok/data/") + rFilename);
+    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/odfimport/data/") + rFilename);
 }
 
 void Test::testHello()

sw/qa/extras/ooxmlimport/ooxmlimport.cxx

@@ -112,7 +112,7 @@ private:
 
 void Test::load(const OUString& rFilename)
 {
-    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/ooxmltok/data/") + rFilename);
+    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/ooxmlimport/data/") + rFilename);
 }
 
 void Test::testN751054()

sw/qa/extras/rtfimport/rtfimport.cxx

@@ -149,7 +149,7 @@ private:
 
 void Test::load(const OUString& rFilename)
 {
-    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/rtftok/data/") + rFilename);
+    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/rtfimport/data/") + rFilename);
 }
 
 int Test::getPages()

sw/qa/extras/ww8import/ww8import.cxx

@@ -68,7 +68,7 @@ private:
 
 void Test::load(const OUString& rFilename)
 {
-    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/ww8tok/data/") + rFilename);
+    mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/ww8import/data/") + rFilename);
 }
 
 void Test::testN757910()