sw qa: rename writerfilter/cppunittests to just writerfilter

15:47 <vmiklos> noelgrandin: any objections to go further with your writerfilter rename and turn sw/qa/writerfilter/cppunittests/* into sw/qa/writerfilter/* ? (suggest to either do it now or not at all if we're past the libreoffice-24-8 branch-off)
15:59 <noelgrandin> vmiklos, not at all, go for it

Change-Id: Ic0eb6907463389f3be326cdf183002f1bfcb42be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168024
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

sw/CppunitTest_sw_writerfilter_dmapper.mk

@@ -17,17 +17,17 @@ $(eval $(call gb_CppunitTest_use_externals,sw_writerfilter_dmapper,\
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_dmapper, \
-    sw/qa/writerfilter/cppunittests/dmapper/CellColorHandler \
-    sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableHandler \
-    sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableManager \
-    sw/qa/writerfilter/cppunittests/dmapper/DomainMapper \
-    sw/qa/writerfilter/cppunittests/dmapper/DomainMapper_Impl \
-    sw/qa/writerfilter/cppunittests/dmapper/GraphicImport \
-    sw/qa/writerfilter/cppunittests/dmapper/TableManager \
-    sw/qa/writerfilter/cppunittests/dmapper/TextEffectsHandler \
-    sw/qa/writerfilter/cppunittests/dmapper/PropertyMap \
-    sw/qa/writerfilter/cppunittests/dmapper/SdtHelper \
-    sw/qa/writerfilter/cppunittests/dmapper/SettingsTable \
+    sw/qa/writerfilter/dmapper/CellColorHandler \
+    sw/qa/writerfilter/dmapper/DomainMapperTableHandler \
+    sw/qa/writerfilter/dmapper/DomainMapperTableManager \
+    sw/qa/writerfilter/dmapper/DomainMapper \
+    sw/qa/writerfilter/dmapper/DomainMapper_Impl \
+    sw/qa/writerfilter/dmapper/GraphicImport \
+    sw/qa/writerfilter/dmapper/TableManager \
+    sw/qa/writerfilter/dmapper/TextEffectsHandler \
+    sw/qa/writerfilter/dmapper/PropertyMap \
+    sw/qa/writerfilter/dmapper/SdtHelper \
+    sw/qa/writerfilter/dmapper/SettingsTable \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_dmapper, \

sw/CppunitTest_sw_writerfilter_filter.mk

@@ -17,7 +17,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_writerfilter_filter,\
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_filter, \
-    sw/qa/writerfilter/cppunittests/filter/WriterFilter \
+    sw/qa/writerfilter/filter/WriterFilter \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_filter, \

sw/CppunitTest_sw_writerfilter_filters_test.mk

@@ -14,7 +14,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_writerfilter_filters_test))
 $(eval $(call gb_CppunitTest_use_external,sw_writerfilter_filters_test,boost_headers))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_filters_test, \
-	sw/qa/writerfilter/cppunittests/filters-test/filters-test \
+	sw/qa/writerfilter/filters-test/filters-test \
 ))
 
 ifeq ($(DISABLE_CVE_TESTS),TRUE)

sw/CppunitTest_sw_writerfilter_misc.mk

@@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_misc, \
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_misc, \
-	sw/qa/writerfilter/cppunittests/misc/misc \
+	sw/qa/writerfilter/misc/misc \
 ))
 
 

sw/CppunitTest_sw_writerfilter_ooxml.mk

@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_writerfilter_ooxml,\
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_ooxml, \
-    sw/qa/writerfilter/cppunittests/ooxml/ooxml \
+    sw/qa/writerfilter/ooxml/ooxml \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_ooxml, \

sw/CppunitTest_sw_writerfilter_rtftok.mk

@@ -17,13 +17,13 @@ $(eval $(call gb_CppunitTest_use_externals,sw_writerfilter_rtftok,\
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_rtftok, \
-    sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchflag \
-    sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchsymbol \
-    sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchvalue \
-    sw/qa/writerfilter/cppunittests/rtftok/rtfdocumentimpl \
-    sw/qa/writerfilter/cppunittests/rtftok/rtfsdrimport \
-    sw/qa/writerfilter/cppunittests/rtftok/rtfsprm \
-    sw/qa/writerfilter/cppunittests/rtftok/rtftokenizer \
+    sw/qa/writerfilter/rtftok/rtfdispatchflag \
+    sw/qa/writerfilter/rtftok/rtfdispatchsymbol \
+    sw/qa/writerfilter/rtftok/rtfdispatchvalue \
+    sw/qa/writerfilter/rtftok/rtfdocumentimpl \
+    sw/qa/writerfilter/rtftok/rtfsdrimport \
+    sw/qa/writerfilter/rtftok/rtfsprm \
+    sw/qa/writerfilter/rtftok/rtftokenizer \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_rtftok, \

sw/qa/writerfilter/dmapper/CellColorHandler.cxx

@@ -22,7 +22,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/DomainMapper.cxx

@@ -25,7 +25,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/DomainMapperTableHandler.cxx

@@ -30,7 +30,7 @@ class Test : public UnoApiXmlTest
 {
 public:
     Test()
-        : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiXmlTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/DomainMapperTableManager.cxx

@@ -21,7 +21,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/DomainMapper_Impl.cxx

@@ -33,7 +33,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/GraphicImport.cxx

@@ -32,7 +32,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/PropertyMap.cxx

@@ -31,7 +31,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/SdtHelper.cxx

@@ -24,7 +24,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/SettingsTable.cxx

@@ -23,7 +23,7 @@ class Test : public UnoApiXmlTest
 {
 public:
     Test()
-        : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiXmlTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/TableManager.cxx

@@ -20,7 +20,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/dmapper/TextEffectsHandler.cxx

@@ -21,7 +21,7 @@ class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
     {
     }
 };

sw/qa/writerfilter/filter/WriterFilter.cxx

@@ -24,7 +24,7 @@ class Test : public UnoApiXmlTest
 {
 public:
     Test()
-        : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/filter/data/")
+        : UnoApiXmlTest("/sw/qa/writerfilter/filter/data/")
     {
     }
 };