move writerfilter inside sw

writerfilter wants to convert incoming RTF and OOXML files into
writer's document model. But it currently has to do so by
manipulating the limited subset that we expose through the UNO
API.

This is both slower and less accurate than having access
to the full document model.

So move it inside, and then we can strip out various hacks, and
optimise imports.

Change-Id: Ie1114d28130ef5f9a786531bc552cb8ee7768015
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165953
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

362 files changed, 659 insertions, 665 deletions

diff --git a/Repository.mk b/Repository.mk
index 9317a29975df..0c00c1ea7443 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -564,7 +564,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
 	t602filter \
 	$(call gb_Helper_optional,SCRIPTING,vbaswobj) \
 	wpftwriter \
-	writerfilter \
+	sw_writerfilter \
 	$(call gb_Helper_optional,DBCONNECTIVITY,writer) \
 ))
 
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 93aadc807f15..0679096de9e8 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -186,7 +186,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	vbahelper \
 	vcl \
 	wizards \
-	writerfilter \
 	writerperfect \
 	xmerge \
     $(call gb_Helper_optional,XMLHELP,xmlhelp) \
@@ -233,7 +232,7 @@ $(eval $(call repositorymodule_serialize,\
 	$(if $(MERGELIBS_MORE),, \
 		sd \
 		$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
-		writerfilter cui) \
+		cui) \
 	$(if $(MERGELIBS), merged, \
 		chartcontroller chartcore oox svx svxcore xo sfx fwk svt vcl) \
 ))
diff --git a/bin/find-german-comments b/bin/find-german-comments
index f4ad23d9d2c1..251f4f77f270 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -354,7 +354,6 @@ class Parser:
             "vbahelper" : 1,
             "vcl" : 1,
             "winaccessibility" : 1,
-            "writerfilter" : 1,
             "writerperfect" : 1,
             "xmlhelp" : 1,
             "xmloff" : 1,
diff --git a/bin/update_pch b/bin/update_pch
index 73be15f0bf97..fcac5b0e4711 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -109,6 +109,7 @@ DEFAULTS = \
     'sw.sw'                             : ( 7, EXCLUDE, EXCLUDE, INCLUDE), # 129.6
     'sw.swui'                           : ( 3, EXCLUDE, INCLUDE, INCLUDE), #  26.1
     'sw.vbaswobj'                       : ( 4, EXCLUDE, INCLUDE, INCLUDE), #  13.1
+    'sw.sw_writerfilter'                : ( 5, EXCLUDE, EXCLUDE, EXCLUDE), #  19.7/27.3
     'tools.tl'                          : ( 5, EXCLUDE, EXCLUDE, EXCLUDE), #   4.2
     'unotools.utl'                      : ( 3, EXCLUDE, EXCLUDE, INCLUDE), #   7.0
     'unoxml.unoxml'                     : ( 1, EXCLUDE, EXCLUDE, EXCLUDE), #   4.6
@@ -116,7 +117,6 @@ DEFAULTS = \
     'vbahelper.msforms'                 : ( 3, EXCLUDE, INCLUDE, INCLUDE), #   5.2
     'vbahelper.vbahelper'               : ( 3, EXCLUDE, EXCLUDE, INCLUDE), #   7.0
     'vcl.vcl'                           : ( 6, EXCLUDE, INCLUDE, INCLUDE), #  35.7
-    'writerfilter.writerfilter'         : ( 5, EXCLUDE, EXCLUDE, EXCLUDE), #  19.7/27.3
     'xmloff.xo'                         : ( 7, EXCLUDE, INCLUDE, INCLUDE), #  22.1
     'xmloff.xof'                        : ( 1, EXCLUDE, EXCLUDE, INCLUDE), #   4.4
     'xmlscript.xmlscript'               : ( 4, EXCLUDE, EXCLUDE, INCLUDE), #   3.6
diff --git a/chart2/CppunitTest_chart2_dump.mk b/chart2/CppunitTest_chart2_dump.mk
index fa46774d762b..cc14424bc4c2 100644
--- a/chart2/CppunitTest_chart2_dump.mk
+++ b/chart2/CppunitTest_chart2_dump.mk
@@ -110,6 +110,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_dump,\
     svtools/util/svt \
     svx/util/svx \
     svx/util/svxcore \
+    sw/util/sw_writerfilter \
     toolkit/util/tk \
     vcl/vcl.common \
     ucb/source/core/ucb1 \
@@ -119,7 +120,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_dump,\
     unotools/util/utl \
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
-    writerfilter/util/writerfilter \
     xmloff/util/xo \
 ))
 
diff --git a/chart2/CppunitTest_chart2_geometry.mk b/chart2/CppunitTest_chart2_geometry.mk
index 1b31bf9d7269..a594b25894e2 100644
--- a/chart2/CppunitTest_chart2_geometry.mk
+++ b/chart2/CppunitTest_chart2_geometry.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_geometry,\
 	svtools/util/svt \
     svx/util/svx \
     svx/util/svxcore \
+    sw/util/sw_writerfilter \
     toolkit/util/tk \
     vcl/vcl.common \
     ucb/source/core/ucb1 \
@@ -123,7 +124,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_geometry,\
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
     uui/util/uui \
-    writerfilter/util/writerfilter \
     xmloff/util/xo \
     xmlscript/util/xmlscript \
 ))
diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk b/chart2/CppunitTest_chart2_pivot_chart_test.mk
index cd8157a5ad53..885b8eda6448 100644
--- a/chart2/CppunitTest_chart2_pivot_chart_test.mk
+++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk
@@ -112,6 +112,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_pivot_chart_test,\
 	svtools/util/svt \
     svx/util/svx \
     svx/util/svxcore \
+    sw/util/sw_writerfilter \
     toolkit/util/tk \
     vcl/vcl.common \
     ucb/source/core/ucb1 \
@@ -121,7 +122,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_pivot_chart_test,\
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
     uui/util/uui \
-    writerfilter/util/writerfilter \
     xmloff/util/xo \
     xmlscript/util/xmlscript \
 ))
diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk
index 87c76ab10383..c6b3dc0a328a 100644
--- a/chart2/CppunitTest_chart2_trendcalculators.mk
+++ b/chart2/CppunitTest_chart2_trendcalculators.mk
@@ -112,6 +112,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\
     svtools/util/svt \
     svx/util/svx \
     svx/util/svxcore \
+    sw/util/sw_writerfilter \
     toolkit/util/tk \
     vcl/vcl.common \
     ucb/source/core/ucb1 \
@@ -121,7 +122,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
     uui/util/uui \
-    writerfilter/util/writerfilter \
     xmloff/util/xo \
     xmlscript/util/xmlscript \
 ))
diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk
index e964891e88d7..eabc54b26ea2 100644
--- a/chart2/CppunitTest_chart2_xshape.mk
+++ b/chart2/CppunitTest_chart2_xshape.mk
@@ -110,6 +110,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\
     svtools/util/svt \
     svx/util/svx \
     svx/util/svxcore \
+    sw/util/sw_writerfilter \
     toolkit/util/tk \
     vcl/vcl.common \
     ucb/source/core/ucb1 \
@@ -119,7 +120,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\
     unotools/util/utl \
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
-    writerfilter/util/writerfilter \
     xmloff/util/xo \
 ))
 
diff --git a/chart2/import_setup.mk b/chart2/import_setup.mk
index a63d314bfc34..0fbbe131941f 100644
--- a/chart2/import_setup.mk
+++ b/chart2/import_setup.mk
@@ -118,6 +118,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import$(1),\
 	svtools/util/svt \
     svx/util/svx \
     svx/util/svxcore \
+    sw/util/sw_writerfilter \
     toolkit/util/tk \
     vcl/vcl.common \
     ucb/source/core/ucb1 \
@@ -127,7 +128,6 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import$(1),\
     unoxml/source/rdf/unordf \
     unoxml/source/service/unoxml \
     uui/util/uui \
-    writerfilter/util/writerfilter \
     xmloff/util/xo \
     xmlscript/util/xmlscript \
 ))
diff --git a/compilerplugins/clang/bufferadd.cxx b/compilerplugins/clang/bufferadd.cxx
index 06f3a2b02733..8f58e46aba14 100644
--- a/compilerplugins/clang/bufferadd.cxx
+++ b/compilerplugins/clang/bufferadd.cxx
@@ -49,9 +49,11 @@ public:
         // some false +
         if (loplugin::isSamePathname(fn, SRCDIR "/unoidl/source/sourcetreeprovider.cxx"))
             return false;
-        if (loplugin::isSamePathname(fn, SRCDIR "/writerfilter/source/dmapper/StyleSheetTable.cxx"))
+        if (loplugin::isSamePathname(fn,
+                                     SRCDIR "/sw/source/writerfilter/dmapper/StyleSheetTable.cxx"))
             return false;
-        if (loplugin::isSamePathname(fn, SRCDIR "/writerfilter/source/dmapper/GraphicImport.cxx"))
+        if (loplugin::isSamePathname(fn,
+                                     SRCDIR "/sw/source/writerfilter/dmapper/GraphicImport.cxx"))
             return false;
         if (loplugin::isSamePathname(fn, SRCDIR "/sdext/source/pdfimport/pdfparse/pdfparse.cxx"))
             return false;
diff --git a/compilerplugins/clang/buriedassign.cxx b/compilerplugins/clang/buriedassign.cxx
index acc8bfe7dd67..8c2b13c3a708 100644
--- a/compilerplugins/clang/buriedassign.cxx
+++ b/compilerplugins/clang/buriedassign.cxx
@@ -129,9 +129,9 @@ public:
             return;
         if (fn == SRCDIR "/dbaccess/source/core/dataaccess/intercept.cxx")
             return;
-        if (fn == SRCDIR "/writerfilter/source/dmapper/DomainMapper.cxx")
+        if (fn == SRCDIR "/sw/writerfilter/dmapper/DomainMapper.cxx")
             return;
-        if (fn == SRCDIR "/writerfilter/source/dmapper/DomainMapper_Impl.cxx")
+        if (fn == SRCDIR "/sw/writerfilter/dmapper/DomainMapper_Impl.cxx")
             return;
         if (fn == SRCDIR "/lotuswordpro/source/filter/lwptablelayout.cxx")
             return;
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index c0079ab86f59..ebceffca0234 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -79,7 +79,7 @@ def is_ignore(srcLoc):
          "include/registry/version.h",
          "include/svtools/rtftoken.h",
          "sc/source/filter/inc/xltracer.hxx",
-         "writerfilter/source/dmapper/FieldTypes.hxx",
+         "sw/source/writerfilter/dmapper/FieldTypes.hxx",
          "vcl/source/fontsubset/cff.cxx",
          "vcl/source/filter/wmf/winmtf.hxx",
          "vcl/source/filter/sgvmain.hxx",
@@ -188,7 +188,7 @@ def is_ignore(srcLoc):
          "include/i18nlangtag/applelangid.hxx", # AppleLanguageId
          "connectivity/source/drivers/firebird/Util.hxx", # firebird::BlobSubtype
          "include/xmloff/xmltoken.hxx",
-         "writerfilter/source/rtftok/rtfcontrolwords.hxx",
+         "sw/source/writerfilter/rtftok/rtfcontrolwords.hxx",
          ]):
          return True
     if d[1] == "UNKNOWN" or d[1] == "LAST" or d[1].endswith("NONE") or d[1].endswith("None") or d[1].endswith("EQUAL_SIZE"):
diff --git a/compilerplugins/clang/virtualdead.py b/compilerplugins/clang/virtualdead.py
index efb5e2e777f3..e653c7e23832 100755
--- a/compilerplugins/clang/virtualdead.py
+++ b/compilerplugins/clang/virtualdead.py
@@ -100,7 +100,7 @@ for name, bitfield in iter(tmp2dict.items()):
     # ignore external stuff
     if srcloc.startswith("workdir/"): continue
     # referenced by generated code in workdir/
-    if srcloc.startswith("writerfilter/source/ooxml/OOXMLFactory.hxx"): continue
+    if srcloc.startswith("sw/source/writerfilter/ooxml/OOXMLFactory.hxx"): continue
     if "0" in bitfield:
         tmp2list.append((srcloc, name, bitfield))
 
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 3eae4d9efe2b..a90b740fa631 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -138,6 +138,6 @@ else
     make_autoload utl program libutllo."$DYLIB"
     make_autoload vcl program libvcllo."$DYLIB"
 fi
-make_autoload writerfilter program libwriterfilterlo."$DYLIB"
+make_autoload sw_writerfilter program libsw_writerfilterlo."$DYLIB"
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index a5b73692fd8f..58884af6b4d6 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -735,7 +735,7 @@ writer_constructor_list = [
 # sw/util/msword.component
     "com_sun_star_comp_Writer_RtfExport_get_implementation",
     "com_sun_star_comp_Writer_DocxExport_get_implementation",
-# writerfilter/util/writerfilter.component
+# sw/util/sw_writerfilter.component
     "com_sun_star_comp_Writer_RtfFilter_get_implementation",
     "com_sun_star_comp_Writer_WriterFilter_get_implementation",
 # writerperfect/source/writer/wpftwriter.component
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index a625ed7e70f0..90245483e6c5 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -13401,6 +13401,74 @@ sw/source/uibase/wrtsh/wrtsh2.cxx
 sw/source/uibase/wrtsh/wrtsh3.cxx
 sw/source/uibase/wrtsh/wrtsh4.cxx
 sw/source/uibase/wrtsh/wrtundo.cxx
+sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
+sw/source/writerfilter/dmapper/BorderHandler.cxx
+sw/source/writerfilter/dmapper/BorderHandler.hxx
+sw/source/writerfilter/dmapper/CellColorHandler.cxx
+sw/source/writerfilter/dmapper/CellColorHandler.hxx
+sw/source/writerfilter/dmapper/CellMarginHandler.cxx
+sw/source/writerfilter/dmapper/CellMarginHandler.hxx
+sw/source/writerfilter/dmapper/ConversionHelper.cxx
+sw/source/writerfilter/dmapper/ConversionHelper.hxx
+sw/source/writerfilter/dmapper/DomainMapper.cxx
+sw/source/writerfilter/dmapper/DomainMapper.hxx
+sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx
+sw/source/writerfilter/dmapper/DomainMapperTableHandler.hxx
+sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx
+sw/source/writerfilter/dmapper/DomainMapperTableManager.hxx
+sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx
+sw/source/writerfilter/dmapper/FFDataHandler.cxx
+sw/source/writerfilter/dmapper/FieldTypes.hxx
+sw/source/writerfilter/dmapper/FontTable.cxx
+sw/source/writerfilter/dmapper/FontTable.hxx
+sw/source/writerfilter/dmapper/FormControlHelper.cxx
+sw/source/writerfilter/dmapper/GraphicHelpers.cxx
+sw/source/writerfilter/dmapper/GraphicImport.cxx
+sw/source/writerfilter/dmapper/GraphicImport.hxx
+sw/source/writerfilter/dmapper/MeasureHandler.cxx
+sw/source/writerfilter/dmapper/ModelEventListener.cxx
+sw/source/writerfilter/dmapper/NumberingManager.cxx
+sw/source/writerfilter/dmapper/NumberingManager.hxx
+sw/source/writerfilter/dmapper/OLEHandler.cxx
+sw/source/writerfilter/dmapper/OLEHandler.hxx
+sw/source/writerfilter/dmapper/PageBordersHandler.cxx
+sw/source/writerfilter/dmapper/PropertyIds.cxx
+sw/source/writerfilter/dmapper/PropertyIds.hxx
+sw/source/writerfilter/dmapper/PropertyMap.cxx
+sw/source/writerfilter/dmapper/PropertyMap.hxx
+sw/source/writerfilter/dmapper/SectionColumnHandler.hxx
+sw/source/writerfilter/dmapper/SettingsTable.cxx
+sw/source/writerfilter/dmapper/StyleSheetTable.cxx
+sw/source/writerfilter/dmapper/StyleSheetTable.hxx
+sw/source/writerfilter/dmapper/TDefTableHandler.cxx
+sw/source/writerfilter/dmapper/TDefTableHandler.hxx
+sw/source/writerfilter/dmapper/TableData.hxx
+sw/source/writerfilter/dmapper/TableManager.hxx
+sw/source/writerfilter/dmapper/TablePropertiesHandler.cxx
+sw/source/writerfilter/dmapper/TablePropertiesHandler.hxx
+sw/source/writerfilter/dmapper/TagLogger.cxx
+sw/source/writerfilter/dmapper/TagLogger.hxx
+sw/source/writerfilter/dmapper/TblStylePrHandler.cxx
+sw/source/writerfilter/dmapper/TblStylePrHandler.hxx
+sw/source/writerfilter/dmapper/TextEffectsHandler.cxx
+sw/source/writerfilter/dmapper/TrackChangesHandler.cxx
+sw/source/writerfilter/dmapper/WrapPolygonHandler.cxx
+sw/source/writerfilter/ooxml/Handler.cxx
+sw/source/writerfilter/ooxml/OOXMLBinaryObjectReference.cxx
+sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
+sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
+sw/source/writerfilter/ooxml/OOXMLFactory.cxx
+sw/source/writerfilter/ooxml/OOXMLFactory.hxx
+sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx
+sw/source/writerfilter/ooxml/OOXMLFastContextHandler.hxx
+sw/source/writerfilter/ooxml/OOXMLFastDocumentHandler.cxx
+sw/source/writerfilter/ooxml/OOXMLFastDocumentHandler.hxx
+sw/source/writerfilter/ooxml/OOXMLFastHelper.hxx
+sw/source/writerfilter/ooxml/OOXMLParserState.cxx
+sw/source/writerfilter/ooxml/OOXMLPropertySet.cxx
+sw/source/writerfilter/ooxml/OOXMLStreamImpl.cxx
+sw/source/writerfilter/ooxml/OOXMLStreamImpl.hxx
 test/source/bootstrapfixture.cxx
 test/source/diff/diff.cxx
 test/source/htmltesttools.cxx
@@ -15077,74 +15145,6 @@ winaccessibility/source/service/AccTopWindowListener.cxx
 winaccessibility/source/service/AccTreeEventListener.cxx
 winaccessibility/source/service/AccWindowEventListener.cxx
 winaccessibility/source/service/msaaservice_impl.cxx
-writerfilter/inc/ooxml/OOXMLDocument.hxx
-writerfilter/source/dmapper/BorderHandler.cxx
-writerfilter/source/dmapper/BorderHandler.hxx
-writerfilter/source/dmapper/CellColorHandler.cxx
-writerfilter/source/dmapper/CellColorHandler.hxx
-writerfilter/source/dmapper/CellMarginHandler.cxx
-writerfilter/source/dmapper/CellMarginHandler.hxx
-writerfilter/source/dmapper/ConversionHelper.cxx
-writerfilter/source/dmapper/ConversionHelper.hxx
-writerfilter/source/dmapper/DomainMapper.cxx
-writerfilter/source/dmapper/DomainMapper.hxx
-writerfilter/source/dmapper/DomainMapperTableHandler.cxx
-writerfilter/source/dmapper/DomainMapperTableHandler.hxx
-writerfilter/source/dmapper/DomainMapperTableManager.cxx
-writerfilter/source/dmapper/DomainMapperTableManager.hxx
-writerfilter/source/dmapper/DomainMapper_Impl.cxx
-writerfilter/source/dmapper/DomainMapper_Impl.hxx
-writerfilter/source/dmapper/FFDataHandler.cxx
-writerfilter/source/dmapper/FieldTypes.hxx
-writerfilter/source/dmapper/FontTable.cxx
-writerfilter/source/dmapper/FontTable.hxx
-writerfilter/source/dmapper/FormControlHelper.cxx
-writerfilter/source/dmapper/GraphicHelpers.cxx
-writerfilter/source/dmapper/GraphicImport.cxx
-writerfilter/source/dmapper/GraphicImport.hxx
-writerfilter/source/dmapper/MeasureHandler.cxx
-writerfilter/source/dmapper/ModelEventListener.cxx
-writerfilter/source/dmapper/NumberingManager.cxx
-writerfilter/source/dmapper/NumberingManager.hxx
-writerfilter/source/dmapper/OLEHandler.cxx
-writerfilter/source/dmapper/OLEHandler.hxx
-writerfilter/source/dmapper/PageBordersHandler.cxx
-writerfilter/source/dmapper/PropertyIds.cxx
-writerfilter/source/dmapper/PropertyIds.hxx
-writerfilter/source/dmapper/PropertyMap.cxx
-writerfilter/source/dmapper/PropertyMap.hxx
-writerfilter/source/dmapper/SectionColumnHandler.hxx
-writerfilter/source/dmapper/SettingsTable.cxx
-writerfilter/source/dmapper/StyleSheetTable.cxx
-writerfilter/source/dmapper/StyleSheetTable.hxx
-writerfilter/source/dmapper/TDefTableHandler.cxx
-writerfilter/source/dmapper/TDefTableHandler.hxx
-writerfilter/source/dmapper/TableData.hxx
-writerfilter/source/dmapper/TableManager.hxx
-writerfilter/source/dmapper/TablePropertiesHandler.cxx
-writerfilter/source/dmapper/TablePropertiesHandler.hxx
-writerfilter/source/dmapper/TagLogger.cxx
-writerfilter/source/dmapper/TagLogger.hxx
-writerfilter/source/dmapper/TblStylePrHandler.cxx
-writerfilter/source/dmapper/TblStylePrHandler.hxx
-writerfilter/source/dmapper/TextEffectsHandler.cxx
-writerfilter/source/dmapper/TrackChangesHandler.cxx
-writerfilter/source/dmapper/WrapPolygonHandler.cxx
-writerfilter/source/ooxml/Handler.cxx
-writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
-writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
-writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
-writerfilter/source/ooxml/OOXMLFactory.cxx
-writerfilter/source/ooxml/OOXMLFactory.hxx
-writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
-writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
-writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
-writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
-writerfilter/source/ooxml/OOXMLFastHelper.hxx
-writerfilter/source/ooxml/OOXMLParserState.cxx
-writerfilter/source/ooxml/OOXMLPropertySet.cxx
-writerfilter/source/ooxml/OOXMLStreamImpl.cxx
-writerfilter/source/ooxml/OOXMLStreamImpl.hxx
 xmlhelp/source/cxxhelp/inc/tvfactory.hxx
 xmlhelp/source/cxxhelp/inc/tvread.hxx
 xmlhelp/source/cxxhelp/provider/content.cxx
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 68b9e5245e68..cc7b9d5e9d25 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -184,6 +184,7 @@ gb_MERGE_LIBRARY_LIST += \
 	solver \
 	storagefd \
 	svgfilter \
+	sw_writerfilter \
 	t602filter \
 	textconversiondlgs \
 	$(call gb_Helper_optional,XMLHELP,ucpchelp1) \
@@ -197,7 +198,6 @@ gb_MERGE_LIBRARY_LIST += \
 	$(if $(filter WNT,$(OS)), \
 		wininetbe1 \
 	) \
-	writerfilter \
 	writerperfect \
 	xmlsecurity \
 
diff --git a/sw/CppunitTest_sw_writerfilter_dmapper.mk b/sw/CppunitTest_sw_writerfilter_dmapper.mk
new file mode 100644
index 000000000000..ecae5cf7db7e
--- /dev/null
+++ b/sw/CppunitTest_sw_writerfilter_dmapper.mk
@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_writerfilter_dmapper,\
+	boost_headers \
+	libxml2 \
+))
+
+$(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 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_dmapper, \
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    oox \
+    sal \
+    subsequenttest \
+    test \
+    unotest \
+    utl \
+    tl \
+    vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_writerfilter_dmapper))
+$(eval $(call gb_CppunitTest_use_vcl,sw_writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_writerfilter_dmapper,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_writerfilter_dmapper,\
+	officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_writerfilter_dmapper))
+
+# we need to explicitly depend on library writerfilter because it is not implied
+# by a link relation
+$(call gb_CppunitTest_get_target,sw_writerfilter_dmapper) : $(call gb_Library_get_target,sw_writerfilter)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_writerfilter_filters_test.mk b/sw/CppunitTest_sw_writerfilter_filters_test.mk
new file mode 100644
index 000000000000..2f1f99f3184b
--- /dev/null
+++ b/sw/CppunitTest_sw_writerfilter_filters_test.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(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 \
+))
+
+ifeq ($(DISABLE_CVE_TESTS),TRUE)
+$(eval $(call gb_CppunitTest_add_defs,sw_writerfilter_filters_test,\
+    -DDISABLE_CVE_TESTS \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_filters_test, \
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	test \
+	unotest \
+	vcl \
+	sw_writerfilter \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_writerfilter_filters_test))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_writerfilter_filters_test))
+$(eval $(call gb_CppunitTest_use_vcl,sw_writerfilter_filters_test))
+
+$(eval $(call gb_CppunitTest_use_components,sw_writerfilter_filters_test,\
+	configmgr/source/configmgr \
+	framework/util/fwk \
+	i18npool/util/i18npool \
+	svtools/util/svt \
+	ucb/source/core/ucb1 \
+	ucb/source/ucp/file/ucpfile1 \
+	sw/util/sw_writerfilter \
+	vcl/vcl.common \
+))
+
+
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_writerfilter_filters_test))
+
+# we need to explicitly depend on library sw_writerfilter because it is not implied
+# by a link relation
+$(call gb_CppunitTest_get_target,sw_writerfilter_filters_test) : $(call gb_Library_get_target,sw_writerfilter)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_writerfilter_misc.mk b/sw/CppunitTest_sw_writerfilter_misc.mk
new file mode 100644
index 000000000000..8ff6cbe94a24
--- /dev/null
+++ b/sw/CppunitTest_sw_writerfilter_misc.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_writerfilter_misc))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_writerfilter_misc))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_writerfilter_misc,\
+	sw/source/writerfilter \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_writerfilter_misc,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sw/source/writerfilter/inc \
+    -I$(SRCDIR)/sw/source/writerfilter/ \
+    -I$(SRCDIR)/sw/source/writerfilter/dmapper \
+))
+
+$(eval $(call gb_CppunitTest_use_external,sw_writerfilter_misc,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_misc, \
+	sw_writerfilter \
+	cppu \
+	sal \
+	salhelper \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_misc, \
+	sw/qa/writerfilter/cppunittests/misc/misc \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_writerfilter_ooxml.mk b/sw/CppunitTest_sw_writerfilter_ooxml.mk
new file mode 100644
index 000000000000..ddb371813d7c
--- /dev/null
+++ b/sw/CppunitTest_sw_writerfilter_ooxml.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_writerfilter_ooxml))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_writerfilter_ooxml,\
+	boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_ooxml, \
+    sw/qa/writerfilter/cppunittests/ooxml/ooxml \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_ooxml, \
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    oox \
+    sal \
+    subsequenttest \
+    test \
+    unotest \
+    utl \
+    tl \
+    vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_writerfilter_ooxml))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_writerfilter_ooxml))
+$(eval $(call gb_CppunitTest_use_vcl,sw_writerfilter_ooxml))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_writerfilter_ooxml,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_writerfilter_ooxml,\
+	officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_writerfilter_ooxml))
+
+# we need to explicitly depend on library sw_writerfilter because it is not implied
+# by a link relation
+$(call gb_CppunitTest_get_target,sw_writerfilter_ooxml) : $(call gb_Library_get_target,sw_writerfilter)
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_writerfilter_rtftok.mk b/sw/CppunitTest_sw_writerfilter_rtftok.mk
new file mode 100644
index 000000000000..7addd16d9d47
--- /dev/null
+++ b/sw/CppunitTest_sw_writerfilter_rtftok.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_writerfilter_rtftok))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_writerfilter_rtftok,\
+	boost_headers \
+	libxml2 \
+))
+
+$(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 \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_rtftok, \
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    oox \
+    sal \
+    subsequenttest \
+    test \
+    unotest \
+    utl \
+    tl \
+    vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sw_writerfilter_rtftok))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_writerfilter_rtftok))
+$(eval $(call gb_CppunitTest_use_vcl,sw_writerfilter_rtftok))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_writerfilter_rtftok,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_writerfilter_rtftok,\
+	officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_writerfilter_rtftok))
+
+# we need to explicitly depend on library sw_writerfilter because it is not implied
+# by a link relation
+$(call gb_CppunitTest_get_target,sw_writerfilter_rtftok) : $(call gb_Library_get_target,sw_writerfilter)
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/CustomTarget_source.mk b/sw/CustomTarget_source.mk
index d0085654a146..ca3c471c5e5f 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/sw/CustomTarget_source.mk
@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,writerfilter/source))
+$(eval $(call gb_CustomTarget_CustomTarget,sw/source/writerfilter))
 
-writerfilter_WORK := $(call gb_CustomTarget_get_workdir,writerfilter/source)
-writerfilter_SRC := $(SRCDIR)/writerfilter/source
+writerfilter_WORK := $(call gb_CustomTarget_get_workdir,sw/source/writerfilter)
+writerfilter_SRC := $(SRCDIR)/sw/source/writerfilter
 
 writerfilter_PYTHONCOMMAND := $(call gb_ExternalExecutable_get_command,python)
 writerfilter_XMLLINTCOMMAND := $(call gb_ExternalExecutable_get_command,xmllint)
@@ -77,10 +77,10 @@ $(writerfilter_GEN_ooxml_Factory_hxx) : $(writerfilter_SRC)/ooxml/factoryinc.py
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
 	$(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
 
-$(writerfilter_GEN_ooxml_Model_validated) : $(writerfilter_SRC)/../documentation/ooxml/model.rng $(writerfilter_SRC_ooxml_Model)
+$(writerfilter_GEN_ooxml_Model_validated) : $(SRCDIR)/sw/documentation/writerfilter/ooxml/model.rng $(writerfilter_SRC_ooxml_Model)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,VAL,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		$(writerfilter_XMLLINTCOMMAND) --noout --relaxng $(writerfilter_SRC)/../documentation/ooxml/model.rng $(writerfilter_SRC_ooxml_Model) > $@ 2>&1 \
+		$(writerfilter_XMLLINTCOMMAND) --noout --relaxng $(SRCDIR)/sw//documentation/writerfilter/ooxml/model.rng $(writerfilter_SRC_ooxml_Model) > $@ 2>&1 \
 		|| (cat $@; false))
 
 $(writerfilter_GEN_ooxml_Model_processed) : $(writerfilter_SRC_ooxml_Preprocess_py) $(writerfilter_DEP_ooxml_Namespaces_txt) $(writerfilter_GEN_ooxml_Model_validated)
@@ -104,7 +104,7 @@ $(writerfilter_WORK)/ooxml/OOXMLFactory%.hxx : $(writerfilter_SRC)/ooxml/factory
 	$(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed) $@) > $@
 
 
-$(call gb_CustomTarget_get_target,writerfilter/source) : $(writerfilter_ALL)
+$(call gb_CustomTarget_get_target,sw/source/writerfilter) : $(writerfilter_ALL)
 
 $(writerfilter_ALL) :| $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalExecutable_get_dependencies,xmllint) $(writerfilter_WORK)/ooxml/.dir
 
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 86988d595077..b3d5665826e8 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -894,3 +894,66 @@ excludelist:
     sw/qa/extras/layout/layout2.cxx:
     # Actually used
     - comphelper/scopeguard.hxx
+    sw/source/writerfilter/dmapper/BorderHandler.cxx:
+    # Needed for method parameter type
+    - tools/color.hxx
+    sw/source/writerfilter/dmapper/ConversionHelper.cxx:
+    # Actually used
+    - com/sun/star/table/BorderLine2.hpp
+    - com/sun/star/lang/Locale.hpp
+    sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    sw/source/writerfilter/dmapper/GraphicImport.cxx:
+    # Actually used
+    - com/sun/star/drawing/XShape.hpp
+    - com/sun/star/graphic/XGraphic.hpp
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    sw/source/writerfilter/dmapper/NumberingManager.cxx:
+    # Actually used
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    - com/sun/star/container/XNameContainer.hpp
+    sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    sw/source/writerfilter/dmapper/OLEHandler.cxx:
+    # Actually used
+    - com/sun/star/drawing/XShape.hpp
+    - com/sun/star/graphic/XGraphic.hpp
+    - com/sun/star/text/XTextDocument.hpp
+    - com/sun/star/text/WrapTextMode.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    sw/source/writerfilter/dmapper/TDefTableHandler.cxx:
+    # Needed for method parameter type
+    - tools/color.hxx
+    sw/source/writerfilter/dmapper/TablePositionHandler.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
+    sw/source/writerfilter/dmapper/PropertyMap.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
+    - com/sun/star/text/XTextColumns.hpp
+    sw/source/writerfilter/dmapper/StyleSheetTable.cxx:
+    # Actually used
+    - com/sun/star/text/XTextDocument.hpp
+    sw/source/writerfilter/ooxml/OOXMLPropertySet.cxx:
+    # Actually used
+    - com/sun/star/drawing/XShape.hpp
+    sw/source/writerfilter/rtftok/rtfsdrimport.hxx:
+    # IWYU assumes std::stack<IncompleteType> in a header is OK, but that's not
+    # the case for all of LO's supported platforms.
+    # See <https://github.com/include-what-you-use/include-what-you-use/issues/175>.
+    - dmapper/GraphicZOrderHelper.hxx
+    sw/source/writerfilter/rtftok/rtfvalue.cxx:
+    # complete type is needed
+    - com/sun/star/embed/XEmbeddedObject.hpp
+    sw/source/writerfilter/rtftok/rtftokenizer.cxx:
+    # Actually used
+    - com/sun/star/task/XStatusIndicator.hpp
+    sw/source/writerfilter/filter/RtfFilter.cxx:
+    - comphelper/scopeguard.hxx
+    sw/source/writerfilter/filter/WriterFilter.cxx:
+    - comphelper/scopeguard.hxx
diff --git a/sw/Library_sw_writerfilter.mk b/sw/Library_sw_writerfilter.mk
new file mode 100644
index 000000000000..deebdf1439e1
--- /dev/null
+++ b/sw/Library_sw_writerfilter.mk
@@ -0,0 +1,141 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,sw_writerfilter))
+
+$(eval $(call gb_Library_use_custom_headers,sw_writerfilter,\
+	officecfg/registry \
+	oox/generated \
+	sw/source/writerfilter \
+))
+
+$(eval $(call gb_Library_set_precompiled_header,sw_writerfilter,sw/inc/pch/precompiled_sw_writerfilter))
+
+$(eval $(call gb_Library_set_include,sw_writerfilter,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/sw/source/writerfilter/inc \
+    -I$(SRCDIR)/sw/source/writerfilter \
+))
+
+$(eval $(call gb_Library_use_sdk_api,sw_writerfilter))
+
+$(eval $(call gb_Library_set_componentfile,sw_writerfilter,sw/util/sw_writerfilter,services))
+
+$(eval $(call gb_Library_use_libraries,sw_writerfilter,\
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    docmodel \
+    editeng \
+    i18nlangtag \
+    i18nutil \
+    msfilter \
+    oox \
+    sal \
+    salhelper \
+    sax \
+    sfx \
+    sot \
+    svt \
+	svxcore \
+    tl \
+    utl \
+    vcl \
+))
+
+$(eval $(call gb_Library_use_externals,sw_writerfilter,\
+	boost_headers \
+	icui18n \
+	icuuc \
+	icu_headers \
+	libxml2 \
+	frozen \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sw_writerfilter,\
+	sw/source/writerfilter/rtftok/rtfcharsets \
+	sw/source/writerfilter/rtftok/rtfcontrolwords \
+	sw/source/writerfilter/rtftok/rtfdispatchdestination \
+	sw/source/writerfilter/rtftok/rtfdispatchflag \
+	sw/source/writerfilter/rtftok/rtfdispatchsymbol \
+	sw/source/writerfilter/rtftok/rtfdispatchvalue \
+	sw/source/writerfilter/rtftok/rtfdocumentfactory \
+	sw/source/writerfilter/rtftok/rtfdocumentimpl \
+	sw/source/writerfilter/rtftok/rtflookahead \
+	sw/source/writerfilter/rtftok/rtfreferenceproperties \
+	sw/source/writerfilter/rtftok/rtfreferencetable \
+	sw/source/writerfilter/rtftok/rtfsdrimport \
+	sw/source/writerfilter/rtftok/rtfskipdestination \
+	sw/source/writerfilter/rtftok/rtfsprm \
+	sw/source/writerfilter/rtftok/rtftokenizer \
+	sw/source/writerfilter/rtftok/rtfvalue \
+    sw/source/writerfilter/dmapper/BorderHandler \
+    sw/source/writerfilter/dmapper/CellColorHandler \
+    sw/source/writerfilter/dmapper/CellMarginHandler \
+    sw/source/writerfilter/dmapper/ConversionHelper \
+	sw/source/writerfilter/dmapper/DocumentProtection \
+    sw/source/writerfilter/dmapper/DomainMapper \
+    sw/source/writerfilter/dmapper/DomainMapperTableHandler \
+    sw/source/writerfilter/dmapper/DomainMapperTableManager \
+    sw/source/writerfilter/dmapper/DomainMapper_Impl \
+	sw/source/writerfilter/dmapper/domainmapperfactory \
+    sw/source/writerfilter/dmapper/FFDataHandler \
+    sw/source/writerfilter/dmapper/FontTable \
+    sw/source/writerfilter/dmapper/FormControlHelper \
+    sw/source/writerfilter/dmapper/GraphicHelpers \
+    sw/source/writerfilter/dmapper/GraphicImport \
+    sw/source/writerfilter/dmapper/LatentStyleHandler \
+    sw/source/writerfilter/dmapper/LoggedResources \
+    sw/source/writerfilter/dmapper/MeasureHandler \
+    sw/source/writerfilter/dmapper/TrackChangesHandler \
+    sw/source/writerfilter/dmapper/ModelEventListener \
+    sw/source/writerfilter/dmapper/NumberingManager \
+    sw/source/writerfilter/dmapper/OLEHandler \
+    sw/source/writerfilter/dmapper/PageBordersHandler \
+    sw/source/writerfilter/dmapper/PropertyIds \
+    sw/source/writerfilter/dmapper/PropertyMap \
+    sw/source/writerfilter/dmapper/PropertyMapHelper \
+    sw/source/writerfilter/dmapper/SdtHelper \
+    sw/source/writerfilter/dmapper/SectionColumnHandler \
+    sw/source/writerfilter/dmapper/SettingsTable \
+    sw/source/writerfilter/dmapper/SmartTagHandler \
+    sw/source/writerfilter/dmapper/StyleSheetTable \
+    sw/source/writerfilter/dmapper/TDefTableHandler \
+    sw/source/writerfilter/dmapper/TableManager \
+    sw/source/writerfilter/dmapper/TablePositionHandler \
+    sw/source/writerfilter/dmapper/TablePropertiesHandler \
+	sw/source/writerfilter/dmapper/TagLogger \
+    sw/source/writerfilter/dmapper/TextEffectsHandler \
+    sw/source/writerfilter/dmapper/TblStylePrHandler \
+    sw/source/writerfilter/dmapper/ThemeHandler \
+    sw/source/writerfilter/dmapper/WrapPolygonHandler \
+	sw/source/writerfilter/dmapper/WriteProtection \
+    sw/source/writerfilter/dmapper/util \
+    sw/source/writerfilter/filter/RtfFilter \
+    sw/source/writerfilter/filter/WriterFilter \
+    sw/source/writerfilter/ooxml/Handler \
+    sw/source/writerfilter/ooxml/OOXMLBinaryObjectReference \
+    sw/source/writerfilter/ooxml/OOXMLDocumentImpl \
+    sw/source/writerfilter/ooxml/OOXMLFactory \
+    sw/source/writerfilter/ooxml/OOXMLFastContextHandler \
+    sw/source/writerfilter/ooxml/OOXMLFastContextHandlerTheme \
+    sw/source/writerfilter/ooxml/OOXMLFastDocumentHandler \
+    sw/source/writerfilter/ooxml/OOXMLParserState \
+    sw/source/writerfilter/ooxml/OOXMLPropertySet \
+    sw/source/writerfilter/ooxml/OOXMLStreamImpl \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,sw_writerfilter,\
+    $(patsubst %,CustomTarget/sw/source/writerfilter/ooxml/OOXMLFactory_%,$(writerfilter_OOXMLNAMESPACES)) \
+    CustomTarget/sw/source/writerfilter/ooxml/OOXMLFactory_generated \
+    CustomTarget/sw/source/writerfilter/ooxml/qnametostr \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 4b57a5393ce7..3fcd0f85ed56 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -27,10 +27,12 @@ $(eval $(call gb_Module_Module,sw))
 
 $(eval $(call gb_Module_add_targets,sw,\
 	CustomTarget_generated \
+    CustomTarget_source \
 	Library_msword \
 	Library_sw \
 	Library_swd \
 	Library_swui \
+    Library_sw_writerfilter \
 	UIConfig_sglobal \
 	UIConfig_sweb \
 	UIConfig_swform \
@@ -168,6 +170,11 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
     CppunitTest_sw_a11y \
     CppunitTest_sw_core_theme \
     CppunitTest_sw_pdf_test \
+    CppunitTest_sw_writerfilter_filters_test \
+    CppunitTest_sw_writerfilter_misc \
+    CppunitTest_sw_writerfilter_dmapper \
+    CppunitTest_sw_writerfilter_ooxml \
+    CppunitTest_sw_writerfilter_rtftok \
 ))
 
 ifneq ($(DISABLE_GUI),TRUE)
diff --git a/writerfilter/README.md b/sw/README.writerfilter.md
index 0c027bf42fd4..0c027bf42fd4 100644
--- a/writerfilter/README.md
+++ b/sw/README.writerfilter.md
diff --git a/writerfilter/documentation/KnownIssues.txt b/sw/documentation/writerfilter/KnownIssues.txt
index 6c84daf0fd90..6c84daf0fd90 100644
--- a/writerfilter/documentation/KnownIssues.txt
+++ b/sw/documentation/writerfilter/KnownIssues.txt
diff --git a/writerfilter/documentation/TODO b/sw/documentation/writerfilter/TODO
index 2f85ab6a24d2..2f85ab6a24d2 100644
--- a/writerfilter/documentation/TODO
+++ b/sw/documentation/writerfilter/TODO
diff --git a/writerfilter/documentation/doxygen/Doxyfile b/sw/documentation/writerfilter/doxygen/Doxyfile
index 6ae1ac4c02aa..6ae1ac4c02aa 100644
--- a/writerfilter/documentation/doxygen/Doxyfile
+++ b/sw/documentation/writerfilter/doxygen/Doxyfile
diff --git a/writerfilter/documentation/doxygen/images/doctok.png b/sw/documentation/writerfilter/doxygen/images/doctok.png
index 15adb9670109..15adb9670109 100644
--- a/writerfilter/documentation/doxygen/images/doctok.png
+++ b/sw/documentation/writerfilter/doxygen/images/doctok.png
diff --git a/writerfilter/documentation/doxygen/images/ooxmlimportchain.png b/sw/documentation/writerfilter/doxygen/images/ooxmlimportchain.png
index 509f1cab5b90..509f1cab5b90 100644
--- a/writerfilter/documentation/doxygen/images/ooxmlimportchain.png
+++ b/sw/documentation/writerfilter/doxygen/images/ooxmlimportchain.png
diff --git a/writerfilter/documentation/ooxml/model.rng b/sw/documentation/writerfilter/ooxml/model.rng
index a7d298991abf..a7d298991abf 100644
--- a/writerfilter/documentation/ooxml/model.rng
+++ b/sw/documentation/writerfilter/ooxml/model.rng
diff --git a/writerfilter/documentation/sprms.txt b/sw/documentation/writerfilter/sprms.txt
index 6250de9e4b96..6250de9e4b96 100644
--- a/writerfilter/documentation/sprms.txt
+++ b/sw/documentation/writerfilter/sprms.txt
diff --git a/writerfilter/documentation/tablesInDoc.txt b/sw/documentation/writerfilter/tablesInDoc.txt
index 50c58a4e290d..50c58a4e290d 100644
--- a/writerfilter/documentation/tablesInDoc.txt
+++ b/sw/documentation/writerfilter/tablesInDoc.txt
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.cxx b/sw/inc/pch/precompiled_sw_writerfilter.cxx
index 135ea5e8c5ba..f0c257a5d32d 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.cxx
+++ b/sw/inc/pch/precompiled_sw_writerfilter.cxx
@@ -7,6 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "precompiled_writerfilter.hxx"
+#include "precompiled_sw_writerfilter.hxx"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/sw/inc/pch/precompiled_sw_writerfilter.hxx
index 1da18905f952..0463a97621c2 100644
--- a/writerfilter/inc/pch/precompiled_writerfilter.hxx
+++ b/sw/inc/pch/precompiled_sw_writerfilter.hxx
@@ -13,29 +13,33 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2021-08-22 14:50:51 using:
- ./bin/update_pch writerfilter writerfilter --cutoff=5 --exclude:system --exclude:module --exclude:local
+ Generated on 2024-04-14 18:53:53 using:
+ ./bin/update_pch sw sw_writerfilter --cutoff=5 --exclude:system --exclude:module --exclude:local
 
  If after updating build fails, use the following command to locate conflicting headers:
- ./bin/update_pch_bisect ./writerfilter/inc/pch/precompiled_writerfilter.hxx "make writerfilter.build" --find-conflicts
+ ./bin/update_pch_bisect ./sw/inc/pch/precompiled_sw_writerfilter.hxx "make sw.build" --find-conflicts
 */
 
 #include <sal/config.h>
 #if PCH_LEVEL >= 1
 #include <algorithm>
+#include <array>
 #include <cassert>
+#include <cmath>
 #include <cstddef>
+#include <cstring>
 #include <functional>
 #include <iomanip>
+#include <iterator>
 #include <limits>
 #include <math.h>
 #include <memory>
+#include <optional>
 #include <ostream>
 #include <string_view>
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include <boost/lexical_cast.hpp>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
@@ -46,25 +50,35 @@
 #include <rtl/character.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/locale.h>
+#include <rtl/math.h>
 #include <rtl/math.hxx>
 #include <rtl/ref.hxx>
+#include <rtl/strbuf.h>
+#include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
+#include <rtl/stringconcat.hxx>
+#include <rtl/stringutils.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/textenc.h>
 #include <rtl/uri.hxx>
+#include <rtl/ustrbuf.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
-#include <sal/macros.h>
 #include <sal/types.h>
 #include <vcl/dllapi.h>
+#include <vcl/mapmod.hxx>
 #endif // PCH_LEVEL >= 2
 #if PCH_LEVEL >= 3
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/range/Range2D.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/basicrange.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -76,6 +90,8 @@
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
+#include <com/sun/star/text/WritingMode2.hpp>
+#include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.h>
@@ -86,7 +102,10 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/genfunc.hxx>
+#include <comphelper/comphelperdllapi.h>
+#include <comphelper/diagnose_ex.hxx>
 #include <comphelper/propertysequence.hxx>
+#include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
@@ -95,23 +114,26 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/weak.hxx>
+#include <dmapper/GraphicZOrderHelper.hxx>
 #include <editeng/editengdllapi.h>
 #include <filter/msfilter/util.hxx>
-#include <o3tl/cow_wrapper.hxx>
+#include <o3tl/safeint.hxx>
+#include <o3tl/string_view.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <oox/dllapi.h>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/token/tokens.hxx>
 #include <ooxml/resourceids.hxx>
 #include <sfx2/dllapi.h>
+#include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/UnitConversion.hxx>
 #include <tools/color.hxx>
-#include <comphelper/diagnose_ex.hxx>
 #include <tools/gen.hxx>
 #include <tools/long.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
+#include <tools/toolsdllapi.h>
 #include <uno/data.h>
 #include <uno/sequence2.h>
 #include <unotools/mediadescriptor.hxx>
diff --git a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx b/sw/qa/writerfilter/cppunittests/dmapper/CellColorHandler.cxx
index fed0a5f45b2a..f7904c95fb9a 100644
--- a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/CellColorHandler.cxx
@@ -17,12 +17,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/CellColorHandler.cxx.
+/// Tests for sw/source/writerfilter/dmapper/CellColorHandler.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx b/sw/qa/writerfilter/cppunittests/dmapper/DomainMapper.cxx
index 885443c5a210..4a69c4520f07 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/DomainMapper.cxx
@@ -20,12 +20,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/DomainMapper.cxx.
+/// Tests for sw/source/writerfilter/dmapper/DomainMapper.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx b/sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableHandler.cxx
index 5924fb90bc2a..0283f80e9ceb 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableHandler.cxx
@@ -25,12 +25,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/DomainMapperTableHandler.cxx.
+/// Tests for sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx.
 class Test : public UnoApiXmlTest
 {
 public:
     Test()
-        : UnoApiXmlTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableManager.cxx b/sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableManager.cxx
index 3743ece63f7b..420ae2a18330 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableManager.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableManager.cxx
@@ -16,12 +16,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/DomainMapperTableManager.cxx.
+/// Tests for sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/sw/qa/writerfilter/cppunittests/dmapper/DomainMapper_Impl.cxx
index 16aa5cbfb2df..fcbc933b18a0 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -28,12 +28,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/DomainMapper_Impl.cxx.
+/// Tests for sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx b/sw/qa/writerfilter/cppunittests/dmapper/GraphicImport.cxx
index 8ec72d5c7b29..c48e15851747 100644
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/GraphicImport.cxx
@@ -27,12 +27,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/GraphicImport.cxx.
+/// Tests for sw/source/writerfilter/dmapper/GraphicImport.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx b/sw/qa/writerfilter/cppunittests/dmapper/PropertyMap.cxx
index 2952f1f93302..78e231e483cd 100644
--- a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/PropertyMap.cxx
@@ -26,12 +26,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/PropertyMap.cxx.
+/// Tests for sw/source/writerfilter/dmapper/PropertyMap.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx b/sw/qa/writerfilter/cppunittests/dmapper/SdtHelper.cxx
index 1d1e1228f4f5..b5e60e1035dc 100644
--- a/writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/SdtHelper.cxx
@@ -19,12 +19,12 @@ using namespace com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/SdtHelper.cxx.
+/// Tests for sw/source/writerfilter/dmapper/SdtHelper.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/SettingsTable.cxx b/sw/qa/writerfilter/cppunittests/dmapper/SettingsTable.cxx
index 52814727f91c..f8305efb5315 100644
--- a/writerfilter/qa/cppunittests/dmapper/SettingsTable.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/SettingsTable.cxx
@@ -18,12 +18,12 @@ using namespace com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/SettingsTable.cxx.
+/// Tests for sw/source/writerfilter/dmapper/SettingsTable.cxx.
 class Test : public UnoApiXmlTest
 {
 public:
     Test()
-        : UnoApiXmlTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/TableManager.cxx b/sw/qa/writerfilter/cppunittests/dmapper/TableManager.cxx
index 0f27633dce74..45dc968c0f22 100644
--- a/writerfilter/qa/cppunittests/dmapper/TableManager.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/TableManager.cxx
@@ -15,12 +15,12 @@ using namespace com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/TableManager.cxx.
+/// Tests for sw/source/writerfilter/dmapper/TableManager.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx b/sw/qa/writerfilter/cppunittests/dmapper/TextEffectsHandler.cxx
index 040fcf124488..c14496179dc6 100644
--- a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/TextEffectsHandler.cxx
@@ -16,12 +16,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/dmapper/TextEffectsHandler.cxx.
+/// Tests for sw/source/writerfilter/dmapper/TextEffectsHandler.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/dmapper/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/dmapper/data/1cell-insidev-rightborder.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/1cell-insidev-rightborder.docx
index d0bc40e23ba1..d0bc40e23ba1 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/1cell-insidev-rightborder.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/1cell-insidev-rightborder.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/alt-chunk.docx
index 40d071ff40a6..40d071ff40a6 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/alt-chunk.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/chart-zorder.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/chart-zorder.docx
index e022a3bde266..e022a3bde266 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/chart-zorder.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/chart-zorder.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/clearing-break.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/clearing-break.docx
index 453a4c2b83d1..453a4c2b83d1 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/clearing-break.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/clearing-break.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/content-control-data-binding-color.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/content-control-data-binding-color.docx
index 0aae9439209b..0aae9439209b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/content-control-data-binding-color.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/content-control-data-binding-color.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/content-control-date-data-binding.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/content-control-date-data-binding.docx
index 9ad644ef642c..9ad644ef642c 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/content-control-date-data-binding.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/content-control-date-data-binding.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/create-date-preserve.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/create-date-preserve.docx
index 4a587ce0d2ef..4a587ce0d2ef 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/create-date-preserve.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/create-date-preserve.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/do-not-break-wrapped-tables.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/do-not-break-wrapped-tables.docx
index 088c056f3511..088c056f3511 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/do-not-break-wrapped-tables.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/do-not-break-wrapped-tables.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/draw-shape-inline-effect.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/draw-shape-inline-effect.docx
index 3eb5b0e2f448..3eb5b0e2f448 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/draw-shape-inline-effect.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/draw-shape-inline-effect.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/fdo78333-1-minimized.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/fdo78333-1-minimized.docx
index 0c4a5bc67288..0c4a5bc67288 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/fdo78333-1-minimized.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/fdo78333-1-minimized.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/field-if-inside-if.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/field-if-inside-if.docx
index 65e238869b1b..65e238869b1b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/field-if-inside-if.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/field-if-inside-if.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floating-table-header.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floating-table-header.docx
index 3840b2550d5b..3840b2550d5b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floating-table-header.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floating-table-header.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floating-table-section-break.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floating-table-section-break.docx
index e5c0cb19b342..e5c0cb19b342 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floating-table-section-break.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floating-table-section-break.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-break-before.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-break-before.docx
index 7fcfed4a637d..7fcfed4a637d 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-break-before.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-break-before.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-footnote-redline.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-footnote-redline.docx
index 10904ce43eb5..10904ce43eb5 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-footnote-redline.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-footnote-redline.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-header-overlap.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-header-overlap.docx
index 1230b9f4e07c..1230b9f4e07c 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-header-overlap.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-header-overlap.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-header.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-header.docx
index 1042dfc0616d..1042dfc0616d 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-header.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-header.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-hidden-anchor.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-hidden-anchor.docx
index 08816aacc47e..08816aacc47e 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-hidden-anchor.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-hidden-anchor.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-nested-3tables.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested-3tables.docx
index f171a1150695..f171a1150695 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-nested-3tables.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested-3tables.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-nested-cellstart.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested-cellstart.docx
index 837d539bb984..837d539bb984 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-nested-cellstart.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested-cellstart.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-nested.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested.docx
index 655e6c0e0bad..655e6c0e0bad 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-nested.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-outer-nonsplit-inner.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-outer-nonsplit-inner.docx
index dc213b1b0d26..dc213b1b0d26 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-outer-nonsplit-inner.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-outer-nonsplit-inner.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-sectend.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-sectend.docx
index 50a121412d10..50a121412d10 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-sectend.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-sectend.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-tbl-overlap.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-tbl-overlap.docx
index b5b23931a240..b5b23931a240 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-tbl-overlap.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-tbl-overlap.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-then-table.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-then-table.docx
index 134473c46012..134473c46012 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-then-table.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-then-table.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-vertical-frame-offset.rtf b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-vertical-frame-offset.rtf
index a7f8c45e83c8..a7f8c45e83c8 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-vertical-frame-offset.rtf
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-vertical-frame-offset.rtf
diff --git a/writerfilter/qa/cppunittests/dmapper/data/floattable-wrap-on-all-pages.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-wrap-on-all-pages.docx
index 91d6686a365e..91d6686a365e 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/floattable-wrap-on-all-pages.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-wrap-on-all-pages.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/follow-page-top-margin.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/follow-page-top-margin.docx
index ceae0b784e18..ceae0b784e18 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/follow-page-top-margin.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/follow-page-top-margin.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/frame-direction.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/frame-direction.docx
index 33f191e80350..33f191e80350 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/frame-direction.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/frame-direction.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/group-shape-rotation.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/group-shape-rotation.docx
index c9fee726bb89..c9fee726bb89 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/group-shape-rotation.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/group-shape-rotation.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/inline-anchored-zorder.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/inline-anchored-zorder.docx
index 93932c4703b7..93932c4703b7 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/inline-anchored-zorder.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/inline-anchored-zorder.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx
index 3792285f4849..3792285f4849 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/large-para-top-margin.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/large-para-top-margin.docx
index 34f24a3e2a12..34f24a3e2a12 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/large-para-top-margin.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/large-para-top-margin.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/layout-in-cell-2.docx
index 5b6926460c80..5b6926460c80 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/layout-in-cell-2.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
index d88761421154..d88761421154 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/negative-page-border-no-margin.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/negative-page-border-no-margin.docx
index 8bd464a9ea6c..8bd464a9ea6c 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/negative-page-border-no-margin.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/negative-page-border-no-margin.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/negative-page-border.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/negative-page-border.docx
index 878ba1e7899b..878ba1e7899b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/negative-page-border.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/negative-page-border.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/nested-floating-table.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/nested-floating-table.docx
index 73fd922fccd5..73fd922fccd5 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/nested-floating-table.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/nested-floating-table.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/num-restart-style-parent.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/num-restart-style-parent.docx
index f908d94b56fe..f908d94b56fe 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/num-restart-style-parent.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/num-restart-style-parent.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/page-break-footer-table.docx
index 376a1fb1e483..376a1fb1e483 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/page-break-footer-table.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/paste-ole.rtf b/sw/qa/writerfilter/cppunittests/dmapper/data/paste-ole.rtf
index 27ce59baa50b..27ce59baa50b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/paste-ole.rtf
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/paste-ole.rtf
diff --git a/writerfilter/qa/cppunittests/dmapper/data/ptab.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/ptab.docx
index d1ae18a27a55..d1ae18a27a55 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/ptab.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/ptab.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/redlined-shape-sdt.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/redlined-shape-sdt.docx
index ea7f4a5bd664..ea7f4a5bd664 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/redlined-shape-sdt.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/redlined-shape-sdt.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/relfromh-insidemargin.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/relfromh-insidemargin.docx
index 1f7a281e8b63..1f7a281e8b63 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/relfromh-insidemargin.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/relfromh-insidemargin.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-block-text.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-block-text.docx
index 2dfbc4a3284a..2dfbc4a3284a 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-block-text.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-block-text.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx
index ed6d7ac54052..ed6d7ac54052 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-checkbox.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-checkbox.docx
index c6718b97c2a0..c6718b97c2a0 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-checkbox.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-checkbox.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-combobox.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-combobox.docx
index 2ae80047cc1b..2ae80047cc1b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-combobox.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-combobox.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-dropdown.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-dropdown.docx
index 7718c0b04daa..7718c0b04daa 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-dropdown.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-dropdown.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-in-para.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-in-para.docx
index 863bc9213b5b..863bc9213b5b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-in-para.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-in-para.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-picture.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-picture.docx
index 25fcc7f6f8f9..25fcc7f6f8f9 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-picture.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-picture.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-plain-text.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-plain-text.docx
index 127d81fd966b..127d81fd966b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-plain-text.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-plain-text.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-rich-text.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-rich-text.docx
index 0d1004ef8a6e..0d1004ef8a6e 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/sdt-run-rich-text.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-rich-text.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/semi-transparent-text.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/semi-transparent-text.docx
index 6c0f8a79cbb4..6c0f8a79cbb4 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/semi-transparent-text.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/semi-transparent-text.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/table-negative-vertical-pos.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/table-negative-vertical-pos.docx
index 2031f4769877..2031f4769877 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/table-negative-vertical-pos.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/table-negative-vertical-pos.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf129205.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf129205.docx
index 4289254d0a97..4289254d0a97 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf129205.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf129205.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf141540ChildRotation.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540ChildRotation.docx
index 902bb6192afe..902bb6192afe 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf141540ChildRotation.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540ChildRotation.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf141540GroupLinePosSize.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540GroupLinePosSize.docx
index d0ceff118eab..d0ceff118eab 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf141540GroupLinePosSize.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540GroupLinePosSize.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf141540GroupRotation.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540GroupRotation.docx
index 13e65c1d122a..13e65c1d122a 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf141540GroupRotation.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540GroupRotation.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf142304GroupPosition.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142304GroupPosition.docx
index 681a6e3b7943..681a6e3b7943 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf142304GroupPosition.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142304GroupPosition.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf142305SquareWrapMargin.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142305SquareWrapMargin.docx
index 9a0fc8a2b5c1..9a0fc8a2b5c1 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf142305SquareWrapMargin.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142305SquareWrapMargin.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf142305StrokeGlowMargin.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142305StrokeGlowMargin.docx
index 3adc2d91b6f1..3adc2d91b6f1 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf142305StrokeGlowMargin.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142305StrokeGlowMargin.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf143208_wrapTight.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf143208_wrapTight.docx
index fab911ad902e..fab911ad902e 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf143208_wrapTight.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf143208_wrapTight.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf143455_SmartArtPosition.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf143455_SmartArtPosition.docx
index 1b1881b1e9ef..1b1881b1e9ef 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf143455_SmartArtPosition.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf143455_SmartArtPosition.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf149840_SmartArtBackground.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf149840_SmartArtBackground.docx
index 318cef8f3c4b..318cef8f3c4b 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf149840_SmartArtBackground.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf149840_SmartArtBackground.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf152884_Char_Transparency.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf152884_Char_Transparency.docx
index e1603956948f..e1603956948f 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf152884_Char_Transparency.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf152884_Char_Transparency.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/tdf158360.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf158360.docx
index a46ee67c007e..a46ee67c007e 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/tdf158360.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/tdf158360.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/textbox-textline-top.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/textbox-textline-top.docx
index dbd750092811..dbd750092811 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/textbox-textline-top.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/textbox-textline-top.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/textbox-textline.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/textbox-textline.docx
index 493604d778e9..493604d778e9 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/textbox-textline.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/textbox-textline.docx
diff --git a/writerfilter/qa/cppunittests/dmapper/data/wrap-poly-crop.docx b/sw/qa/writerfilter/cppunittests/dmapper/data/wrap-poly-crop.docx
index 1835a130d740..1835a130d740 100644
--- a/writerfilter/qa/cppunittests/dmapper/data/wrap-poly-crop.docx
+++ b/sw/qa/writerfilter/cppunittests/dmapper/data/wrap-poly-crop.docx
diff --git a/writerfilter/qa/cppunittests/filters-test/README b/sw/qa/writerfilter/cppunittests/filters-test/README
index 2cc9fb3cb58f..2cc9fb3cb58f 100644
--- a/writerfilter/qa/cppunittests/filters-test/README
+++ b/sw/qa/writerfilter/cppunittests/filters-test/README
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf
index 5cd42052c657..5cd42052c657 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf
index 0c639810d34a..0c639810d34a 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/EDB-18749-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
index 18795f5be1d8..18795f5be1d8 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf
index 6257e1071cfc..6257e1071cfc 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/destinationtest-1.rtf
index 63465b073627..63465b073627 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/destinationtest-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-2.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/destinationtest-2.rtf
index f0152b0fab36..f0152b0fab36 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-2.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/destinationtest-2.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/nopropertyset-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
index 59c3630a7197..59c3630a7197 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/popstate-1.rtf
index 04189171327a..04189171327a 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/popstate-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-2.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/popstate-2.rtf
index 273bb135c9d0..273bb135c9d0 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/popstate-2.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/popstate-2.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/propheight-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/propheight-1.rtf
index 130ff3f232f1..130ff3f232f1 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/propheight-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/propheight-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
index 45597c0857e9..45597c0857e9 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-5.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-5.rtf
index a03be130d1f8..a03be130d1f8 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-5.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-5.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-6.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-6.rtf
index 67a0ea1750f1..67a0ea1750f1 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-6.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-6.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-7.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-7.rtf
index df41b1f88e2a..df41b1f88e2a 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-7.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-7.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-1.rtf
index 7cdb94ab2c79..7cdb94ab2c79 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-2.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-2.rtf
index c0bd2691cdde..c0bd2691cdde 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-2.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-2.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-3.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-3.rtf
index 112162397f43..112162397f43 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-3.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-3.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/indeterminate/.gitignore b/sw/qa/writerfilter/cppunittests/filters-test/data/indeterminate/.gitignore
index e69de29bb2d1..e69de29bb2d1 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/indeterminate/.gitignore
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/indeterminate/.gitignore
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf
index da97fba5793c..da97fba5793c 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf
index 70321707fe0e..70321707fe0e 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf
index c5ea695bc4fd..c5ea695bc4fd 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf
index 757cfe62e85a..757cfe62e85a 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf
index 4dac58c0c701..4dac58c0c701 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf
index da5d0f39bf82..da5d0f39bf82 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf
index 44d28adcbc57..44d28adcbc57 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf
index 64109fbe280f..64109fbe280f 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
index 44ed96982e40..44ed96982e40 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18754-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
index f4a7369205f6..f4a7369205f6 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18940-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
index 794f325c5bde..794f325c5bde 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
index 7cdb1e15c2f2..7cdb1e15c2f2 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/abi3623.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/abi3623.rtf
index a47161a2fb1c..a47161a2fb1c 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/abi3623.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/abi3623.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/abi4817.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/abi4817.rtf
index 58d88f5fff5b..58d88f5fff5b 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/abi4817.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/abi4817.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/fdo49666.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/fdo49666.rtf
index 5a673ca0461c..5a673ca0461c 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/fdo49666.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/fdo49666.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/fdo64656.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/fdo64656.rtf
index 1c815c4e7517..1c815c4e7517 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/fdo64656.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/fdo64656.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/i74153.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/i74153.rtf
index 7e81865adb5f..7e81865adb5f 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/i74153.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/i74153.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/i84172.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/i84172.rtf
index ce6616e5e6a5..ce6616e5e6a5 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/i84172.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/i84172.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/parser-state-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/parser-state-1.rtf
index 3fe4b287640c..3fe4b287640c 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/parser-state-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/parser-state-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/rhbz960019.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/rhbz960019.rtf
index 869aa339b0f1..869aa339b0f1 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/rhbz960019.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/rhbz960019.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
index c3ffebc2b643..c3ffebc2b643 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
index 9576906da152..9576906da152 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
index 0925203f86ff..0925203f86ff 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-1.rtf
index 5b34e7f61835..5b34e7f61835 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-2.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-2.rtf
index 58328edc97db..58328edc97db 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-2.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-2.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-3.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-3.rtf
index 9fd58921468a..9fd58921468a 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-3.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-3.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-4.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-4.rtf
index 28093f25a6c5..28093f25a6c5 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/tablemanager-4.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-4.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/data/pass/valuelist-1.rtf b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/valuelist-1.rtf
index 847e165c5dfa..847e165c5dfa 100644
--- a/writerfilter/qa/cppunittests/filters-test/data/pass/valuelist-1.rtf
+++ b/sw/qa/writerfilter/cppunittests/filters-test/data/pass/valuelist-1.rtf
diff --git a/writerfilter/qa/cppunittests/filters-test/filters-test.cxx b/sw/qa/writerfilter/cppunittests/filters-test/filters-test.cxx
index 36ebeee2142e..7ce932bfb8af 100644
--- a/writerfilter/qa/cppunittests/filters-test/filters-test.cxx
+++ b/sw/qa/writerfilter/cppunittests/filters-test/filters-test.cxx
@@ -16,7 +16,7 @@
 using namespace ::com::sun::star;
 
 /**
- * Unit test invoking writerfilter/ only.
+ * Unit test invoking sw/source/writerfilter/ only.
  *
  * This does only minimal testing, checking if the filter crashes and returns
  * the expected bool value for given inputs. More fine-grained tests can be
@@ -70,7 +70,7 @@ CPPUNIT_TEST_FIXTURE(RtfTest, testFilter)
 {
 #ifndef DISABLE_CVE_TESTS
     testDir(OUString(),
-            m_directories.getURLFromSrc(u"/writerfilter/qa/cppunittests/filters-test/data/"));
+            m_directories.getURLFromSrc(u"/sw/qa/writerfilter/cppunittests/filters-test/data/"));
 #endif
 }
 
diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx b/sw/qa/writerfilter/cppunittests/misc/misc.cxx
index 845e43b053e8..845e43b053e8 100644
--- a/writerfilter/qa/cppunittests/misc/misc.cxx
+++ b/sw/qa/writerfilter/cppunittests/misc/misc.cxx
diff --git a/writerfilter/qa/cppunittests/ooxml/data/floattable-leak.docx b/sw/qa/writerfilter/cppunittests/ooxml/data/floattable-leak.docx
index 249cad95b8f4..249cad95b8f4 100644
--- a/writerfilter/qa/cppunittests/ooxml/data/floattable-leak.docx
+++ b/sw/qa/writerfilter/cppunittests/ooxml/data/floattable-leak.docx
diff --git a/writerfilter/qa/cppunittests/ooxml/data/floattable-tables-lost.docx b/sw/qa/writerfilter/cppunittests/ooxml/data/floattable-tables-lost.docx
index 5d1d9624c8a5..5d1d9624c8a5 100644
--- a/writerfilter/qa/cppunittests/ooxml/data/floattable-tables-lost.docx
+++ b/sw/qa/writerfilter/cppunittests/ooxml/data/floattable-tables-lost.docx
diff --git a/writerfilter/qa/cppunittests/ooxml/ooxml.cxx b/sw/qa/writerfilter/cppunittests/ooxml/ooxml.cxx
index 32133df9ba7e..c146560ed352 100644
--- a/writerfilter/qa/cppunittests/ooxml/ooxml.cxx
+++ b/sw/qa/writerfilter/cppunittests/ooxml/ooxml.cxx
@@ -16,12 +16,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/ooxml/.
+/// Tests for sw/source/writerfilter/ooxml/.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/ooxml/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/ooxml/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/rtftok/data/center-after-page.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/center-after-page.rtf
index c4713906ed4c..c4713906ed4c 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/center-after-page.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/center-after-page.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/char-hidden-intbl.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/char-hidden-intbl.rtf
index 76fea92fac49..76fea92fac49 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/char-hidden-intbl.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/char-hidden-intbl.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf
index f6ec013cb1dc..f6ec013cb1dc 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/duplicated-image.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/duplicated-image.rtf
index f225ff1f248f..f225ff1f248f 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/duplicated-image.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/duplicated-image.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/floating-table.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/floating-table.rtf
index b88664139070..b88664139070 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/floating-table.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/floating-table.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/floattable-tbl-overlap.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/floattable-tbl-overlap.rtf
index 16b8ef7fd4a5..16b8ef7fd4a5 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/floattable-tbl-overlap.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/floattable-tbl-overlap.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/floattable-then-sect-break.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/floattable-then-sect-break.rtf
index 7ad179608c34..7ad179608c34 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/floattable-then-sect-break.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/floattable-then-sect-break.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/follow-style.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/follow-style.rtf
index 6e627c784e6b..6e627c784e6b 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/follow-style.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/follow-style.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/invalid-hex.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/invalid-hex.rtf
index 8f9224c0e905..8f9224c0e905 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/invalid-hex.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/invalid-hex.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/left-margin-dedup.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/left-margin-dedup.rtf
index 8536694a294b..8536694a294b 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/left-margin-dedup.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/left-margin-dedup.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/negative-page-border.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/negative-page-border.rtf
index e5bec712a60e..e5bec712a60e 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/negative-page-border.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/negative-page-border.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/old-para-num-left-margin.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/old-para-num-left-margin.rtf
index 99825370e3b4..99825370e3b4 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/old-para-num-left-margin.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/old-para-num-left-margin.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/page.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/page.rtf
index 75e1376388f2..75e1376388f2 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/page.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/page.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/picture-in-textframe.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/picture-in-textframe.rtf
index ec0a07690bdf..ec0a07690bdf 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/picture-in-textframe.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/picture-in-textframe.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/picw-pich.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/picw-pich.rtf
index 56a2b0d1e86a..56a2b0d1e86a 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/picw-pich.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/picw-pich.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/data/watermark.rtf b/sw/qa/writerfilter/cppunittests/rtftok/data/watermark.rtf
index 552f93844451..552f93844451 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/watermark.rtf
+++ b/sw/qa/writerfilter/cppunittests/rtftok/data/watermark.rtf
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfdispatchflag.cxx b/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchflag.cxx
index 3b9e1dd1a592..e3a993bdf6f4 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfdispatchflag.cxx
+++ b/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchflag.cxx
@@ -18,12 +18,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/rtftok/rtfdispatchflag.cxx.
+/// Tests for sw/source/writerfilter/rtftok/rtfdispatchflag.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+        : UnoApiTest("sw/qa//writerfilter/cppunittests/rtftok/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx b/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchsymbol.cxx
index bf3ecc937ebc..c2adb308611d 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx
+++ b/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchsymbol.cxx
@@ -18,12 +18,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/rtftok/rtfdispatchsymbol.cxx.
+/// Tests for sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx.
 class Test : public UnoApiXmlTest
 {
 public:
     Test()
-        : UnoApiXmlTest("/writerfilter/qa/cppunittests/rtftok/data/")
+        : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx b/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchvalue.cxx
index 374c5246ca7a..8d8de947b86e 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx
+++ b/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchvalue.cxx
@@ -17,12 +17,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/rtftok/rtfdispatchvalue.cxx.
+/// Tests for sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx b/sw/qa/writerfilter/cppunittests/rtftok/rtfdocumentimpl.cxx
index 4249b29040d4..6b42db055c3a 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx
+++ b/sw/qa/writerfilter/cppunittests/rtftok/rtfdocumentimpl.cxx
@@ -22,12 +22,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/rtftok/rtfdocumentimpl.cxx.
+/// Tests for sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx b/sw/qa/writerfilter/cppunittests/rtftok/rtfsdrimport.cxx
index 69b7fd994739..a6e3da91c754 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
+++ b/sw/qa/writerfilter/cppunittests/rtftok/rtfsdrimport.cxx
@@ -18,12 +18,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/rtftok/rtfsdrimport.cxx.
+/// Tests for sw/source/writerfilter/rtftok/rtfsdrimport.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx b/sw/qa/writerfilter/cppunittests/rtftok/rtfsprm.cxx
index f233fa89652e..a736936b54c6 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
+++ b/sw/qa/writerfilter/cppunittests/rtftok/rtfsprm.cxx
@@ -17,12 +17,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/rtftok/rtfsprm.cxx.
+/// Tests for sw/source/writerfilter/rtftok/rtfsprm.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
     {
     }
 };
diff --git a/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx b/sw/qa/writerfilter/cppunittests/rtftok/rtftokenizer.cxx
index 8f0691872fa6..16a32a82db6a 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx
+++ b/sw/qa/writerfilter/cppunittests/rtftok/rtftokenizer.cxx
@@ -15,12 +15,12 @@ using namespace ::com::sun::star;
 
 namespace
 {
-/// Tests for writerfilter/source/rtftok/rtftokenizer.cxx.
+/// Tests for sw/source/writerfilter/rtftok/rtftokenizer.cxx.
 class Test : public UnoApiTest
 {
 public:
     Test()
-        : UnoApiTest("/writerfilter/qa/cppunittests/rtftok/data/")
+        : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
     {
     }
 };
diff --git a/writerfilter/qa/ooxml/watch-generated-code.sh b/sw/qa/writerfilter/ooxml/watch-generated-code.sh
index d7026be82b0c..d7026be82b0c 100755
--- a/writerfilter/qa/ooxml/watch-generated-code.sh
+++ b/sw/qa/writerfilter/ooxml/watch-generated-code.sh
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/sw/source/writerfilter/dmapper/BorderHandler.cxx
index ed14194c2a01..ed14194c2a01 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/sw/source/writerfilter/dmapper/BorderHandler.cxx
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/sw/source/writerfilter/dmapper/BorderHandler.hxx
index 9a523bffc576..9a523bffc576 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/sw/source/writerfilter/dmapper/BorderHandler.hxx
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/sw/source/writerfilter/dmapper/CellColorHandler.cxx
index b99d40c08a12..b99d40c08a12 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/sw/source/writerfilter/dmapper/CellColorHandler.cxx
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/sw/source/writerfilter/dmapper/CellColorHandler.hxx
index 418f8e1f93e4..418f8e1f93e4 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/sw/source/writerfilter/dmapper/CellColorHandler.hxx
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/sw/source/writerfilter/dmapper/CellMarginHandler.cxx
index e8262156e55f..e8262156e55f 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/sw/source/writerfilter/dmapper/CellMarginHandler.cxx
diff --git a/writerfilter/source/dmapper/CellMarginHandler.hxx b/sw/source/writerfilter/dmapper/CellMarginHandler.hxx
index 8dcbf2dc5245..8dcbf2dc5245 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.hxx
+++ b/sw/source/writerfilter/dmapper/CellMarginHandler.hxx
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/sw/source/writerfilter/dmapper/ConversionHelper.cxx
index 7f3f11544c85..7f3f11544c85 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/sw/source/writerfilter/dmapper/ConversionHelper.cxx
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx b/sw/source/writerfilter/dmapper/ConversionHelper.hxx
index c14c8033ea58..c14c8033ea58 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/sw/source/writerfilter/dmapper/ConversionHelper.hxx
diff --git a/writerfilter/source/dmapper/DocumentProtection.cxx b/sw/source/writerfilter/dmapper/DocumentProtection.cxx
index dddf964c4022..dddf964c4022 100644
--- a/writerfilter/source/dmapper/DocumentProtection.cxx
+++ b/sw/source/writerfilter/dmapper/DocumentProtection.cxx
diff --git a/writerfilter/source/dmapper/DocumentProtection.hxx b/sw/source/writerfilter/dmapper/DocumentProtection.hxx
index 2ec0f3f21c41..2ec0f3f21c41 100644
--- a/writerfilter/source/dmapper/DocumentProtection.hxx
+++ b/sw/source/writerfilter/dmapper/DocumentProtection.hxx
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/sw/source/writerfilter/dmapper/DomainMapper.cxx
index 22a2a17045c0..22a2a17045c0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper.cxx
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/sw/source/writerfilter/dmapper/DomainMapper.hxx
index 9d9771e640f5..9d9771e640f5 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper.hxx
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx
index 422d643cb7ba..422d643cb7ba 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapperTableHandler.cxx
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/sw/source/writerfilter/dmapper/DomainMapperTableHandler.hxx
index 376a6d366688..376a6d366688 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/sw/source/writerfilter/dmapper/DomainMapperTableHandler.hxx
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx
index 2bbdfe86540e..2bbdfe86540e 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapperTableManager.cxx
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/sw/source/writerfilter/dmapper/DomainMapperTableManager.hxx
index 6b5cee85743f..6b5cee85743f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/sw/source/writerfilter/dmapper/DomainMapperTableManager.hxx
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index 4fdacfb2f944..4fdacfb2f944 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx
index 94ab42de3f98..94ab42de3f98 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/sw/source/writerfilter/dmapper/FFDataHandler.cxx
index 507327cf8333..507327cf8333 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/sw/source/writerfilter/dmapper/FFDataHandler.cxx
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx b/sw/source/writerfilter/dmapper/FFDataHandler.hxx
index f8a88f5c9d6b..f8a88f5c9d6b 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/sw/source/writerfilter/dmapper/FFDataHandler.hxx
diff --git a/writerfilter/source/dmapper/FieldTypes.hxx b/sw/source/writerfilter/dmapper/FieldTypes.hxx
index 144d1efe1370..144d1efe1370 100644
--- a/writerfilter/source/dmapper/FieldTypes.hxx
+++ b/sw/source/writerfilter/dmapper/FieldTypes.hxx
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/sw/source/writerfilter/dmapper/FontTable.cxx
index c64276585a5d..c64276585a5d 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/sw/source/writerfilter/dmapper/FontTable.cxx
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/sw/source/writerfilter/dmapper/FontTable.hxx
index 092affebe871..092affebe871 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/sw/source/writerfilter/dmapper/FontTable.hxx
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/sw/source/writerfilter/dmapper/FormControlHelper.cxx
index 40f5d703815e..40f5d703815e 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/sw/source/writerfilter/dmapper/FormControlHelper.cxx
diff --git a/writerfilter/source/dmapper/FormControlHelper.hxx b/sw/source/writerfilter/dmapper/FormControlHelper.hxx
index 326637f85f78..326637f85f78 100644
--- a/writerfilter/source/dmapper/FormControlHelper.hxx
+++ b/sw/source/writerfilter/dmapper/FormControlHelper.hxx
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/sw/source/writerfilter/dmapper/GraphicHelpers.cxx
index 32e13b04bec8..32e13b04bec8 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/sw/source/writerfilter/dmapper/GraphicHelpers.cxx
diff --git a/writerfilter/source/dmapper/GraphicHelpers.hxx b/sw/source/writerfilter/dmapper/GraphicHelpers.hxx
index 21eb65f88402..21eb65f88402 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.hxx
+++ b/sw/source/writerfilter/dmapper/GraphicHelpers.hxx
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/sw/source/writerfilter/dmapper/GraphicImport.cxx
index 2df2569530a1..2df2569530a1 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/sw/source/writerfilter/dmapper/GraphicImport.cxx
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/sw/source/writerfilter/dmapper/GraphicImport.hxx
index dae19ce85c03..dae19ce85c03 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/sw/source/writerfilter/dmapper/GraphicImport.hxx
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/sw/source/writerfilter/dmapper/LatentStyleHandler.cxx
index bc381d21fe3e..bc381d21fe3e 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/sw/source/writerfilter/dmapper/LatentStyleHandler.cxx
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/sw/source/writerfilter/dmapper/LatentStyleHandler.hxx
index 52a4d9e7c318..52a4d9e7c318 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/sw/source/writerfilter/dmapper/LatentStyleHandler.hxx
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/sw/source/writerfilter/dmapper/LoggedResources.cxx
index 05ebcd057532..05ebcd057532 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/sw/source/writerfilter/dmapper/LoggedResources.cxx
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/sw/source/writerfilter/dmapper/LoggedResources.hxx
index c0927c9130c4..c0927c9130c4 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/sw/source/writerfilter/dmapper/LoggedResources.hxx
diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/sw/source/writerfilter/dmapper/MeasureHandler.cxx
index 5eea9a5c613b..5eea9a5c613b 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/sw/source/writerfilter/dmapper/MeasureHandler.cxx
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/sw/source/writerfilter/dmapper/MeasureHandler.hxx
index 8a6f9639eec5..8a6f9639eec5 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/sw/source/writerfilter/dmapper/MeasureHandler.hxx
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/sw/source/writerfilter/dmapper/ModelEventListener.cxx
index 4df26105a37c..4df26105a37c 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/sw/source/writerfilter/dmapper/ModelEventListener.cxx
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx b/sw/source/writerfilter/dmapper/ModelEventListener.hxx
index 47cd94b80a82..47cd94b80a82 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/sw/source/writerfilter/dmapper/ModelEventListener.hxx
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/sw/source/writerfilter/dmapper/NumberingManager.cxx
index ec8e1be07c7f..ec8e1be07c7f 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/sw/source/writerfilter/dmapper/NumberingManager.cxx
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/sw/source/writerfilter/dmapper/NumberingManager.hxx
index 64156ba60ceb..64156ba60ceb 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/sw/source/writerfilter/dmapper/NumberingManager.hxx
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/sw/source/writerfilter/dmapper/OLEHandler.cxx
index e0671c8a21b6..e0671c8a21b6 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/sw/source/writerfilter/dmapper/OLEHandler.cxx
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/sw/source/writerfilter/dmapper/OLEHandler.hxx
index 67fed0128186..67fed0128186 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/sw/source/writerfilter/dmapper/OLEHandler.hxx
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/sw/source/writerfilter/dmapper/PageBordersHandler.cxx
index 89548eb351ee..89548eb351ee 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/sw/source/writerfilter/dmapper/PageBordersHandler.cxx
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/sw/source/writerfilter/dmapper/PageBordersHandler.hxx
index 537d34b8104b..537d34b8104b 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/sw/source/writerfilter/dmapper/PageBordersHandler.hxx
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/sw/source/writerfilter/dmapper/PropertyIds.cxx
index 5aefa9d3b68b..5aefa9d3b68b 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/sw/source/writerfilter/dmapper/PropertyIds.cxx
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/sw/source/writerfilter/dmapper/PropertyIds.hxx
index 724648683335..724648683335 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/sw/source/writerfilter/dmapper/PropertyIds.hxx
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/sw/source/writerfilter/dmapper/PropertyMap.cxx
index 3e836f831e63..3e836f831e63 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/sw/source/writerfilter/dmapper/PropertyMap.cxx
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/sw/source/writerfilter/dmapper/PropertyMap.hxx
index 711ef47195a0..711ef47195a0 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/sw/source/writerfilter/dmapper/PropertyMap.hxx
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/sw/source/writerfilter/dmapper/PropertyMapHelper.cxx
index a944dc147aa4..a944dc147aa4 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/sw/source/writerfilter/dmapper/PropertyMapHelper.cxx
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/sw/source/writerfilter/dmapper/PropertyMapHelper.hxx
index 472e1bcfa6f5..472e1bcfa6f5 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/sw/source/writerfilter/dmapper/PropertyMapHelper.hxx
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/sw/source/writerfilter/dmapper/SdtHelper.cxx
index 09e7903b5f98..09e7903b5f98 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/sw/source/writerfilter/dmapper/SdtHelper.cxx
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/sw/source/writerfilter/dmapper/SdtHelper.hxx
index 85b95a48818b..85b95a48818b 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/sw/source/writerfilter/dmapper/SdtHelper.hxx
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/sw/source/writerfilter/dmapper/SectionColumnHandler.cxx
index 9fed9c34a68e..9fed9c34a68e 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.cxx
+++ b/sw/source/writerfilter/dmapper/SectionColumnHandler.cxx
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/sw/source/writerfilter/dmapper/SectionColumnHandler.hxx
index cbef67460ed7..cbef67460ed7 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/sw/source/writerfilter/dmapper/SectionColumnHandler.hxx
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/sw/source/writerfilter/dmapper/SettingsTable.cxx
index a665a01c7209..a665a01c7209 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/sw/source/writerfilter/dmapper/SettingsTable.cxx
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/sw/source/writerfilter/dmapper/SettingsTable.hxx
index f5ccb1bec96e..f5ccb1bec96e 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/sw/source/writerfilter/dmapper/SettingsTable.hxx
diff --git a/writerfilter/source/dmapper/SmartTagHandler.cxx b/sw/source/writerfilter/dmapper/SmartTagHandler.cxx
index c92fa7c44be5..c92fa7c44be5 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.cxx
+++ b/sw/source/writerfilter/dmapper/SmartTagHandler.cxx
diff --git a/writerfilter/source/dmapper/SmartTagHandler.hxx b/sw/source/writerfilter/dmapper/SmartTagHandler.hxx
index 7999b9dcc22a..7999b9dcc22a 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.hxx
+++ b/sw/source/writerfilter/dmapper/SmartTagHandler.hxx
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/sw/source/writerfilter/dmapper/StyleSheetTable.cxx
index 1b5633b009fd..1b5633b009fd 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/sw/source/writerfilter/dmapper/StyleSheetTable.cxx
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/sw/source/writerfilter/dmapper/StyleSheetTable.hxx
index 2308257a32b2..2308257a32b2 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/sw/source/writerfilter/dmapper/StyleSheetTable.hxx
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/sw/source/writerfilter/dmapper/TDefTableHandler.cxx
index 9626beb595bc..9626beb595bc 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/sw/source/writerfilter/dmapper/TDefTableHandler.cxx
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/sw/source/writerfilter/dmapper/TDefTableHandler.hxx
index 7b02d4ae0907..7b02d4ae0907 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/sw/source/writerfilter/dmapper/TDefTableHandler.hxx
diff --git a/writerfilter/source/dmapper/TableData.hxx b/sw/source/writerfilter/dmapper/TableData.hxx
index ded929696e5a..ded929696e5a 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/sw/source/writerfilter/dmapper/TableData.hxx
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/sw/source/writerfilter/dmapper/TableManager.cxx
index 6a0c70a39f52..6a0c70a39f52 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/sw/source/writerfilter/dmapper/TableManager.cxx
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/sw/source/writerfilter/dmapper/TableManager.hxx
index f98c992a3595..f98c992a3595 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/sw/source/writerfilter/dmapper/TableManager.hxx
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/sw/source/writerfilter/dmapper/TablePositionHandler.cxx
index 62d423d29515..62d423d29515 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/sw/source/writerfilter/dmapper/TablePositionHandler.cxx
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/sw/source/writerfilter/dmapper/TablePositionHandler.hxx
index 1b9d9c808391..1b9d9c808391 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/sw/source/writerfilter/dmapper/TablePositionHandler.hxx
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/sw/source/writerfilter/dmapper/TablePropertiesHandler.cxx
index 8ea3eae5c056..8ea3eae5c056 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/sw/source/writerfilter/dmapper/TablePropertiesHandler.cxx
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/sw/source/writerfilter/dmapper/TablePropertiesHandler.hxx
index 9d8f90dc3925..9d8f90dc3925 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/sw/source/writerfilter/dmapper/TablePropertiesHandler.hxx
diff --git a/writerfilter/source/dmapper/TagLogger.cxx b/sw/source/writerfilter/dmapper/TagLogger.cxx
index 7a96b4aa6041..7a96b4aa6041 100644
--- a/writerfilter/source/dmapper/TagLogger.cxx
+++ b/sw/source/writerfilter/dmapper/TagLogger.cxx
diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/sw/source/writerfilter/dmapper/TagLogger.hxx
index f6d38096255f..f6d38096255f 100644
--- a/writerfilter/source/dmapper/TagLogger.hxx
+++ b/sw/source/writerfilter/dmapper/TagLogger.hxx
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/sw/source/writerfilter/dmapper/TblStylePrHandler.cxx
index 13656e169ba7..13656e169ba7 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/sw/source/writerfilter/dmapper/TblStylePrHandler.cxx
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/sw/source/writerfilter/dmapper/TblStylePrHandler.hxx
index 4be7d379a647..4be7d379a647 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/sw/source/writerfilter/dmapper/TblStylePrHandler.hxx
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/sw/source/writerfilter/dmapper/TextEffectsHandler.cxx
index 35d7efbbfee2..35d7efbbfee2 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/sw/source/writerfilter/dmapper/TextEffectsHandler.cxx
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/sw/source/writerfilter/dmapper/TextEffectsHandler.hxx
index 30a8435b2829..30a8435b2829 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/sw/source/writerfilter/dmapper/TextEffectsHandler.hxx
diff --git a/writerfilter/source/dmapper/ThemeColorHandler.hxx b/sw/source/writerfilter/dmapper/ThemeColorHandler.hxx
index 012b4ee3472f..012b4ee3472f 100644
--- a/writerfilter/source/dmapper/ThemeColorHandler.hxx
+++ b/sw/source/writerfilter/dmapper/ThemeColorHandler.hxx
diff --git a/writerfilter/source/dmapper/ThemeHandler.cxx b/sw/source/writerfilter/dmapper/ThemeHandler.cxx
index 1acd7073f69c..1acd7073f69c 100644
--- a/writerfilter/source/dmapper/ThemeHandler.cxx
+++ b/sw/source/writerfilter/dmapper/ThemeHandler.cxx
diff --git a/writerfilter/source/dmapper/ThemeHandler.hxx b/sw/source/writerfilter/dmapper/ThemeHandler.hxx
index 8d7574991b29..8d7574991b29 100644
--- a/writerfilter/source/dmapper/ThemeHandler.hxx
+++ b/sw/source/writerfilter/dmapper/ThemeHandler.hxx
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx b/sw/source/writerfilter/dmapper/TrackChangesHandler.cxx
index 47a52d6df695..47a52d6df695 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.cxx
+++ b/sw/source/writerfilter/dmapper/TrackChangesHandler.cxx
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/sw/source/writerfilter/dmapper/TrackChangesHandler.hxx
index b3417ccced1f..b3417ccced1f 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/sw/source/writerfilter/dmapper/TrackChangesHandler.hxx
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/sw/source/writerfilter/dmapper/WrapPolygonHandler.cxx
index 319fae5c4cb0..319fae5c4cb0 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/sw/source/writerfilter/dmapper/WrapPolygonHandler.cxx
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/sw/source/writerfilter/dmapper/WrapPolygonHandler.hxx
index 8d3e1a3d8493..8d3e1a3d8493 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/sw/source/writerfilter/dmapper/WrapPolygonHandler.hxx
diff --git a/writerfilter/source/dmapper/WriteProtection.cxx b/sw/source/writerfilter/dmapper/WriteProtection.cxx
index c300ab09e303..c300ab09e303 100644
--- a/writerfilter/source/dmapper/WriteProtection.cxx
+++ b/sw/source/writerfilter/dmapper/WriteProtection.cxx
diff --git a/writerfilter/source/dmapper/WriteProtection.hxx b/sw/source/writerfilter/dmapper/WriteProtection.hxx
index 21b420b4bcd9..21b420b4bcd9 100644
--- a/writerfilter/source/dmapper/WriteProtection.hxx
+++ b/sw/source/writerfilter/dmapper/WriteProtection.hxx
diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/sw/source/writerfilter/dmapper/domainmapperfactory.cxx
index e52d5d2e8dec..e52d5d2e8dec 100644
--- a/writerfilter/source/dmapper/domainmapperfactory.cxx
+++ b/sw/source/writerfilter/dmapper/domainmapperfactory.cxx
diff --git a/writerfilter/source/dmapper/util.cxx b/sw/source/writerfilter/dmapper/util.cxx
index 3e22cbb72784..3e22cbb72784 100644
--- a/writerfilter/source/dmapper/util.cxx
+++ b/sw/source/writerfilter/dmapper/util.cxx
diff --git a/writerfilter/source/dmapper/util.hxx b/sw/source/writerfilter/dmapper/util.hxx
index 9d172331a7ca..9d172331a7ca 100644
--- a/writerfilter/source/dmapper/util.hxx
+++ b/sw/source/writerfilter/dmapper/util.hxx
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/sw/source/writerfilter/filter/RtfFilter.cxx
index 8f80b85353b2..8f80b85353b2 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/sw/source/writerfilter/filter/RtfFilter.cxx
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/sw/source/writerfilter/filter/WriterFilter.cxx
index 8935f462636f..8935f462636f 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/sw/source/writerfilter/filter/WriterFilter.cxx
diff --git a/writerfilter/inc/dmapper/CommentProperties.hxx b/sw/source/writerfilter/inc/dmapper/CommentProperties.hxx
index c554418108c4..c554418108c4 100644
--- a/writerfilter/inc/dmapper/CommentProperties.hxx
+++ b/sw/source/writerfilter/inc/dmapper/CommentProperties.hxx
diff --git a/writerfilter/inc/dmapper/DomainMapperFactory.hxx b/sw/source/writerfilter/inc/dmapper/DomainMapperFactory.hxx
index ea7ab81e1a1b..ea7ab81e1a1b 100644
--- a/writerfilter/inc/dmapper/DomainMapperFactory.hxx
+++ b/sw/source/writerfilter/inc/dmapper/DomainMapperFactory.hxx
diff --git a/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx b/sw/source/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
index b5bb27eea81b..b5bb27eea81b 100644
--- a/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
+++ b/sw/source/writerfilter/inc/dmapper/GraphicZOrderHelper.hxx
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/sw/source/writerfilter/inc/dmapper/resourcemodel.hxx
index 5b64de51ba2c..5b64de51ba2c 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/sw/source/writerfilter/inc/dmapper/resourcemodel.hxx
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 91a4aeec5a3f..91a4aeec5a3f 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/sw/source/writerfilter/inc/ooxml/OOXMLDocument.hxx
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/sw/source/writerfilter/inc/ooxml/QNameToString.hxx
index d7d27d302bd2..d7d27d302bd2 100644
--- a/writerfilter/inc/ooxml/QNameToString.hxx
+++ b/sw/source/writerfilter/inc/ooxml/QNameToString.hxx
diff --git a/writerfilter/inc/rtftok/RTFDocument.hxx b/sw/source/writerfilter/inc/rtftok/RTFDocument.hxx
index 44d0173a6f3e..44d0173a6f3e 100644
--- a/writerfilter/inc/rtftok/RTFDocument.hxx
+++ b/sw/source/writerfilter/inc/rtftok/RTFDocument.hxx
diff --git a/writerfilter/source/ooxml/Handler.cxx b/sw/source/writerfilter/ooxml/Handler.cxx
index 7cbd9b6bfdc3..7cbd9b6bfdc3 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/sw/source/writerfilter/ooxml/Handler.cxx
diff --git a/writerfilter/source/ooxml/Handler.hxx b/sw/source/writerfilter/ooxml/Handler.hxx
index df6673d44318..df6673d44318 100644
--- a/writerfilter/source/ooxml/Handler.hxx
+++ b/sw/source/writerfilter/ooxml/Handler.hxx
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx b/sw/source/writerfilter/ooxml/OOXMLBinaryObjectReference.cxx
index f33d9bed0e0e..f33d9bed0e0e 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLBinaryObjectReference.cxx
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx b/sw/source/writerfilter/ooxml/OOXMLBinaryObjectReference.hxx
index 09502f208199..09502f208199 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLBinaryObjectReference.hxx
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
index 0530969fbccc..0530969fbccc 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.cxx
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
index 87aae13ab94f..87aae13ab94f 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLDocumentImpl.hxx
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/sw/source/writerfilter/ooxml/OOXMLFactory.cxx
index b11cf07c2900..b11cf07c2900 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFactory.cxx
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/sw/source/writerfilter/ooxml/OOXMLFactory.hxx
index 146bc5d61631..146bc5d61631 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFactory.hxx
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx
index a0881fb9f362..a0881fb9f362 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.cxx
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.hxx
index 4dfb05d91503..4dfb05d91503 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFastContextHandler.hxx
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandlerTheme.cxx b/sw/source/writerfilter/ooxml/OOXMLFastContextHandlerTheme.cxx
index 0167f0416a26..0167f0416a26 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandlerTheme.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFastContextHandlerTheme.cxx
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandlerTheme.hxx b/sw/source/writerfilter/ooxml/OOXMLFastContextHandlerTheme.hxx
index 9622406f7867..9622406f7867 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandlerTheme.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFastContextHandlerTheme.hxx
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/sw/source/writerfilter/ooxml/OOXMLFastDocumentHandler.cxx
index 0e831bd35627..0e831bd35627 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFastDocumentHandler.cxx
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/sw/source/writerfilter/ooxml/OOXMLFastDocumentHandler.hxx
index 3d28d2bd742c..3d28d2bd742c 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFastDocumentHandler.hxx
diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/sw/source/writerfilter/ooxml/OOXMLFastHelper.hxx
index ecb8b6943b11..ecb8b6943b11 100644
--- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLFastHelper.hxx
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/sw/source/writerfilter/ooxml/OOXMLParserState.cxx
index b8cc55377b5b..b8cc55377b5b 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLParserState.cxx
diff --git a/writerfilter/source/ooxml/OOXMLParserState.hxx b/sw/source/writerfilter/ooxml/OOXMLParserState.hxx
index 626f8cdf326c..626f8cdf326c 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLParserState.hxx
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/sw/source/writerfilter/ooxml/OOXMLPropertySet.cxx
index f29efe875aee..f29efe875aee 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLPropertySet.cxx
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/sw/source/writerfilter/ooxml/OOXMLPropertySet.hxx
index 465873963a78..465873963a78 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLPropertySet.hxx
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/sw/source/writerfilter/ooxml/OOXMLStreamImpl.cxx
index aa2567ad53b2..aa2567ad53b2 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/sw/source/writerfilter/ooxml/OOXMLStreamImpl.cxx
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/sw/source/writerfilter/ooxml/OOXMLStreamImpl.hxx
index ec65290c6214..ec65290c6214 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/sw/source/writerfilter/ooxml/OOXMLStreamImpl.hxx
diff --git a/writerfilter/source/ooxml/README b/sw/source/writerfilter/ooxml/README
index c72b341aef65..c72b341aef65 100644
--- a/writerfilter/source/ooxml/README
+++ b/sw/source/writerfilter/ooxml/README
diff --git a/writerfilter/source/ooxml/factory_ns.py b/sw/source/writerfilter/ooxml/factory_ns.py
index 18b07aba1c62..18b07aba1c62 100644
--- a/writerfilter/source/ooxml/factory_ns.py
+++ b/sw/source/writerfilter/ooxml/factory_ns.py
diff --git a/writerfilter/source/ooxml/factoryimpl.py b/sw/source/writerfilter/ooxml/factoryimpl.py
index 40618b95faca..40618b95faca 100644
--- a/writerfilter/source/ooxml/factoryimpl.py
+++ b/sw/source/writerfilter/ooxml/factoryimpl.py
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/sw/source/writerfilter/ooxml/factoryimpl_ns.py
index d4d5a2f67dc6..d4d5a2f67dc6 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/sw/source/writerfilter/ooxml/factoryimpl_ns.py
diff --git a/writerfilter/source/ooxml/factoryinc.py b/sw/source/writerfilter/ooxml/factoryinc.py
index ec07f7fda1ce..ec07f7fda1ce 100644
--- a/writerfilter/source/ooxml/factoryinc.py
+++ b/sw/source/writerfilter/ooxml/factoryinc.py
diff --git a/writerfilter/source/ooxml/model.xml b/sw/source/writerfilter/ooxml/model.xml
index 2f84e72c0615..2f84e72c0615 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/sw/source/writerfilter/ooxml/model.xml
diff --git a/writerfilter/source/ooxml/modelpreprocess.py b/sw/source/writerfilter/ooxml/modelpreprocess.py
index d6ef4c175430..d6ef4c175430 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/sw/source/writerfilter/ooxml/modelpreprocess.py
diff --git a/writerfilter/source/ooxml/qnametostr.py b/sw/source/writerfilter/ooxml/qnametostr.py
index e09a98570111..e09a98570111 100644
--- a/writerfilter/source/ooxml/qnametostr.py
+++ b/sw/source/writerfilter/ooxml/qnametostr.py
diff --git a/writerfilter/source/ooxml/resourceids.py b/sw/source/writerfilter/ooxml/resourceids.py
index 70325c9d376b..70325c9d376b 100644
--- a/writerfilter/source/ooxml/resourceids.py
+++ b/sw/source/writerfilter/ooxml/resourceids.py
diff --git a/writerfilter/source/ooxml/tox.ini b/sw/source/writerfilter/ooxml/tox.ini
index c1781905c427..c1781905c427 100644
--- a/writerfilter/source/ooxml/tox.ini
+++ b/sw/source/writerfilter/ooxml/tox.ini
diff --git a/writerfilter/source/rtftok/README b/sw/source/writerfilter/rtftok/README
index 4adbb7563b8b..a23b40ece4fb 100644
--- a/writerfilter/source/rtftok/README
+++ b/sw/source/writerfilter/rtftok/README
@@ -7,6 +7,6 @@ imported. To view the current status:
 
 ----
 grep M_TOKEN starmath/source/ooxmlimport.cxx |sed 's/.*\(M_TOKEN(\) /\1/;s/ ).*/)/'|sort -u > ~/math-import-list
-grep '[^_]M_TOKEN' writerfilter/source/rtftok/rtfdocumentimpl.cxx |sed 's/.*\(M_TOKEN(\)/\1/;s/).*/)/'|sort -u > ~/wf-export-list
+grep '[^_]M_TOKEN' sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx |sed 's/.*\(M_TOKEN(\)/\1/;s/).*/)/'|sort -u > ~/wf-export-list
 diff -u ~/math-import-list ~/wf-export-list |grep ^-M_TOKEN
 ----
diff --git a/writerfilter/source/rtftok/rtfcharsets.cxx b/sw/source/writerfilter/rtftok/rtfcharsets.cxx
index 1b71bbb9951c..1b71bbb9951c 100644
--- a/writerfilter/source/rtftok/rtfcharsets.cxx
+++ b/sw/source/writerfilter/rtftok/rtfcharsets.cxx
diff --git a/writerfilter/source/rtftok/rtfcharsets.hxx b/sw/source/writerfilter/rtftok/rtfcharsets.hxx
index 826dea271f6b..826dea271f6b 100644
--- a/writerfilter/source/rtftok/rtfcharsets.hxx
+++ b/sw/source/writerfilter/rtftok/rtfcharsets.hxx
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/sw/source/writerfilter/rtftok/rtfcontrolwords.cxx
index 8b035b37bbe2..8b035b37bbe2 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/sw/source/writerfilter/rtftok/rtfcontrolwords.cxx
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/sw/source/writerfilter/rtftok/rtfcontrolwords.hxx
index c1480ffb0231..c1480ffb0231 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/sw/source/writerfilter/rtftok/rtfcontrolwords.hxx
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/sw/source/writerfilter/rtftok/rtfdispatchdestination.cxx
index 8789c3f858a8..8789c3f858a8 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/sw/source/writerfilter/rtftok/rtfdispatchdestination.cxx
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/sw/source/writerfilter/rtftok/rtfdispatchflag.cxx
index 753f1c3fbba9..753f1c3fbba9 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/sw/source/writerfilter/rtftok/rtfdispatchflag.cxx
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx
index b40fd55dde9b..b40fd55dde9b 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/sw/source/writerfilter/rtftok/rtfdispatchsymbol.cxx
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx
index 1e7552dd71b1..1e7552dd71b1 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/sw/source/writerfilter/rtftok/rtfdispatchvalue.cxx
diff --git a/writerfilter/source/rtftok/rtfdocumentfactory.cxx b/sw/source/writerfilter/rtftok/rtfdocumentfactory.cxx
index 75b109b6842d..75b109b6842d 100644
--- a/writerfilter/source/rtftok/rtfdocumentfactory.cxx
+++ b/sw/source/writerfilter/rtftok/rtfdocumentfactory.cxx
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx
index ab700ff0dc14..ab700ff0dc14 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/sw/source/writerfilter/rtftok/rtfdocumentimpl.cxx
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx
index f05f7d321cdd..f05f7d321cdd 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/sw/source/writerfilter/rtftok/rtfdocumentimpl.hxx
diff --git a/writerfilter/source/rtftok/rtffly.hxx b/sw/source/writerfilter/rtftok/rtffly.hxx
index b1dec0c77b4f..b1dec0c77b4f 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/sw/source/writerfilter/rtftok/rtffly.hxx
diff --git a/writerfilter/source/rtftok/rtflistener.hxx b/sw/source/writerfilter/rtftok/rtflistener.hxx
index 150440afbb47..150440afbb47 100644
--- a/writerfilter/source/rtftok/rtflistener.hxx
+++ b/sw/source/writerfilter/rtftok/rtflistener.hxx
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/sw/source/writerfilter/rtftok/rtflookahead.cxx
index 033feacce69d..033feacce69d 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/sw/source/writerfilter/rtftok/rtflookahead.cxx
diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/sw/source/writerfilter/rtftok/rtflookahead.hxx
index 9ec213f624c3..9ec213f624c3 100644
--- a/writerfilter/source/rtftok/rtflookahead.hxx
+++ b/sw/source/writerfilter/rtftok/rtflookahead.hxx
diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/sw/source/writerfilter/rtftok/rtfreferenceproperties.cxx
index d32557bc7d46..d32557bc7d46 100644
--- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx
+++ b/sw/source/writerfilter/rtftok/rtfreferenceproperties.cxx
diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.hxx b/sw/source/writerfilter/rtftok/rtfreferenceproperties.hxx
index 6a5e5618ba30..6a5e5618ba30 100644
--- a/writerfilter/source/rtftok/rtfreferenceproperties.hxx
+++ b/sw/source/writerfilter/rtftok/rtfreferenceproperties.hxx
diff --git a/writerfilter/source/rtftok/rtfreferencetable.cxx b/sw/source/writerfilter/rtftok/rtfreferencetable.cxx
index 1a70a93d9bf8..1a70a93d9bf8 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.cxx
+++ b/sw/source/writerfilter/rtftok/rtfreferencetable.cxx
diff --git a/writerfilter/source/rtftok/rtfreferencetable.hxx b/sw/source/writerfilter/rtftok/rtfreferencetable.hxx
index 76cbaacf2371..76cbaacf2371 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.hxx
+++ b/sw/source/writerfilter/rtftok/rtfreferencetable.hxx
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
index d9c57be4a8a8..d9c57be4a8a8 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/sw/source/writerfilter/rtftok/rtfsdrimport.hxx
index b06803bd0f64..b06803bd0f64 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/sw/source/writerfilter/rtftok/rtfsdrimport.hxx
diff --git a/writerfilter/source/rtftok/rtfskipdestination.cxx b/sw/source/writerfilter/rtftok/rtfskipdestination.cxx
index ad2122318333..ad2122318333 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.cxx
+++ b/sw/source/writerfilter/rtftok/rtfskipdestination.cxx
diff --git a/writerfilter/source/rtftok/rtfskipdestination.hxx b/sw/source/writerfilter/rtftok/rtfskipdestination.hxx
index 4a894373f1e4..4a894373f1e4 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.hxx
+++ b/sw/source/writerfilter/rtftok/rtfskipdestination.hxx
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/sw/source/writerfilter/rtftok/rtfsprm.cxx
index 148d39c2e48b..148d39c2e48b 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/sw/source/writerfilter/rtftok/rtfsprm.cxx
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/sw/source/writerfilter/rtftok/rtfsprm.hxx
index 132a2bbcbeb2..132a2bbcbeb2 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/sw/source/writerfilter/rtftok/rtfsprm.hxx
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/sw/source/writerfilter/rtftok/rtftokenizer.cxx
index 420c6d36f0c3..420c6d36f0c3 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/sw/source/writerfilter/rtftok/rtftokenizer.cxx
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/sw/source/writerfilter/rtftok/rtftokenizer.hxx
index feb74fc63c57..feb74fc63c57 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/sw/source/writerfilter/rtftok/rtftokenizer.hxx
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/sw/source/writerfilter/rtftok/rtfvalue.cxx
index 6654a3f2eca5..6654a3f2eca5 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/sw/source/writerfilter/rtftok/rtfvalue.cxx
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/sw/source/writerfilter/rtftok/rtfvalue.hxx
index 6c87c61a1d05..6c87c61a1d05 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/sw/source/writerfilter/rtftok/rtfvalue.hxx
diff --git a/writerfilter/util/writerfilter.component b/sw/util/sw_writerfilter.component
index 63e5931e850e..63e5931e850e 100644
--- a/writerfilter/util/writerfilter.component
+++ b/sw/util/sw_writerfilter.component
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 4d514359bf50..fe625a1bc88a 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -172,7 +172,7 @@ fuzzer_writer_libraries = \
     msword \
     sw \
     swd \
-    writerfilter \
+    sw_writerfilter \
     wpftwriter \
     textfd \
     guesslang \
diff --git a/writerfilter/CppunitTest_writerfilter_dmapper.mk b/writerfilter/CppunitTest_writerfilter_dmapper.mk
deleted file mode 100644
index 8a4745630c29..000000000000
--- a/writerfilter/CppunitTest_writerfilter_dmapper.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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/.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_dmapper))
-
-$(eval $(call gb_CppunitTest_use_externals,writerfilter_dmapper,\
-	boost_headers \
-	libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_dmapper, \
-    writerfilter/qa/cppunittests/dmapper/CellColorHandler \
-    writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler \
-    writerfilter/qa/cppunittests/dmapper/DomainMapperTableManager \
-    writerfilter/qa/cppunittests/dmapper/DomainMapper \
-    writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl \
-    writerfilter/qa/cppunittests/dmapper/GraphicImport \
-    writerfilter/qa/cppunittests/dmapper/TableManager \
-    writerfilter/qa/cppunittests/dmapper/TextEffectsHandler \
-    writerfilter/qa/cppunittests/dmapper/PropertyMap \
-    writerfilter/qa/cppunittests/dmapper/SdtHelper \
-    writerfilter/qa/cppunittests/dmapper/SettingsTable \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,writerfilter_dmapper, \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    oox \
-    sal \
-    subsequenttest \
-    test \
-    unotest \
-    utl \
-    tl \
-    vcl \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_dmapper))
-
-$(eval $(call gb_CppunitTest_use_ure,writerfilter_dmapper))
-$(eval $(call gb_CppunitTest_use_vcl,writerfilter_dmapper))
-
-$(eval $(call gb_CppunitTest_use_rdb,writerfilter_dmapper,services))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_dmapper,\
-	officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,writerfilter_dmapper))
-
-# we need to explicitly depend on library writerfilter because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_dmapper) : $(call gb_Library_get_target,writerfilter)
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/CppunitTest_writerfilter_filters_test.mk b/writerfilter/CppunitTest_writerfilter_filters_test.mk
deleted file mode 100644
index a08c6667511f..000000000000
--- a/writerfilter/CppunitTest_writerfilter_filters_test.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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/.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_filters_test))
-
-$(eval $(call gb_CppunitTest_use_external,writerfilter_filters_test,boost_headers))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_filters_test, \
-	writerfilter/qa/cppunittests/filters-test/filters-test \
-))
-
-ifeq ($(DISABLE_CVE_TESTS),TRUE)
-$(eval $(call gb_CppunitTest_add_defs,writerfilter_filters_test,\
-    -DDISABLE_CVE_TESTS \
-))
-endif
-
-$(eval $(call gb_CppunitTest_use_libraries,writerfilter_filters_test, \
-	comphelper \
-	cppu \
-	cppuhelper \
-	sal \
-	test \
-	unotest \
-	vcl \
-	writerfilter \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_filters_test))
-
-$(eval $(call gb_CppunitTest_use_ure,writerfilter_filters_test))
-$(eval $(call gb_CppunitTest_use_vcl,writerfilter_filters_test))
-
-$(eval $(call gb_CppunitTest_use_components,writerfilter_filters_test,\
-	configmgr/source/configmgr \
-	framework/util/fwk \
-	i18npool/util/i18npool \
-	svtools/util/svt \
-	ucb/source/core/ucb1 \
-	ucb/source/ucp/file/ucpfile1 \
-	writerfilter/util/writerfilter \
-	vcl/vcl.common \
-))
-
-
-
-$(eval $(call gb_CppunitTest_use_configuration,writerfilter_filters_test))
-
-# we need to explicitly depend on library writerfilter because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_filters_test) : $(call gb_Library_get_target,writerfilter)
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/CppunitTest_writerfilter_misc.mk b/writerfilter/CppunitTest_writerfilter_misc.mk
deleted file mode 100644
index 0822e90bc285..000000000000
--- a/writerfilter/CppunitTest_writerfilter_misc.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_misc))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_misc))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_misc,\
-	writerfilter/source \
-))
-
-$(eval $(call gb_CppunitTest_set_include,writerfilter_misc,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/writerfilter/inc \
-    -I$(SRCDIR)/writerfilter/source \
-    -I$(SRCDIR)/writerfilter/source/dmapper \
-))
-
-$(eval $(call gb_CppunitTest_use_external,writerfilter_misc,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_libraries,writerfilter_misc, \
-	writerfilter \
-	cppu \
-	sal \
-	salhelper \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_misc, \
-	writerfilter/qa/cppunittests/misc/misc \
-))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/CppunitTest_writerfilter_ooxml.mk b/writerfilter/CppunitTest_writerfilter_ooxml.mk
deleted file mode 100644
index 8d5d214f2470..000000000000
--- a/writerfilter/CppunitTest_writerfilter_ooxml.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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/.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_ooxml))
-
-$(eval $(call gb_CppunitTest_use_externals,writerfilter_ooxml,\
-	boost_headers \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_ooxml, \
-    writerfilter/qa/cppunittests/ooxml/ooxml \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,writerfilter_ooxml, \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    oox \
-    sal \
-    subsequenttest \
-    test \
-    unotest \
-    utl \
-    tl \
-    vcl \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_ooxml))
-
-$(eval $(call gb_CppunitTest_use_ure,writerfilter_ooxml))
-$(eval $(call gb_CppunitTest_use_vcl,writerfilter_ooxml))
-
-$(eval $(call gb_CppunitTest_use_rdb,writerfilter_ooxml,services))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_ooxml,\
-	officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,writerfilter_ooxml))
-
-# we need to explicitly depend on library writerfilter because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_ooxml) : $(call gb_Library_get_target,writerfilter)
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
deleted file mode 100644
index d0a1e37bc16c..000000000000
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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/.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_rtftok))
-
-$(eval $(call gb_CppunitTest_use_externals,writerfilter_rtftok,\
-	boost_headers \
-	libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \
-    writerfilter/qa/cppunittests/rtftok/rtfdispatchflag \
-    writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol \
-    writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue \
-    writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl \
-    writerfilter/qa/cppunittests/rtftok/rtfsdrimport \
-    writerfilter/qa/cppunittests/rtftok/rtfsprm \
-    writerfilter/qa/cppunittests/rtftok/rtftokenizer \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    oox \
-    sal \
-    subsequenttest \
-    test \
-    unotest \
-    utl \
-    tl \
-    vcl \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_rtftok))
-
-$(eval $(call gb_CppunitTest_use_ure,writerfilter_rtftok))
-$(eval $(call gb_CppunitTest_use_vcl,writerfilter_rtftok))
-
-$(eval $(call gb_CppunitTest_use_rdb,writerfilter_rtftok,services))
-
-$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_rtftok,\
-	officecfg/registry \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,writerfilter_rtftok))
-
-# we need to explicitly depend on library writerfilter because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,writerfilter_rtftok) : $(call gb_Library_get_target,writerfilter)
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/IwyuFilter_writerfilter.yaml b/writerfilter/IwyuFilter_writerfilter.yaml
deleted file mode 100644
index 50a4c889333a..000000000000
--- a/writerfilter/IwyuFilter_writerfilter.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-assumeFilename: writerfilter/source/filter/WriterFilter.cxx
-excludelist:
-    writerfilter/source/dmapper/BorderHandler.cxx:
-    # Needed for method parameter type
-    - tools/color.hxx
-    writerfilter/source/dmapper/ConversionHelper.cxx:
-    # Actually used
-    - com/sun/star/table/BorderLine2.hpp
-    - com/sun/star/lang/Locale.hpp
-    writerfilter/source/dmapper/DomainMapperTableManager.cxx:
-    # Needed for rtl::math::round
-    - rtl/math.hxx
-    writerfilter/source/dmapper/GraphicImport.cxx:
-    # Actually used
-    - com/sun/star/drawing/XShape.hpp
-    - com/sun/star/graphic/XGraphic.hpp
-    - com/sun/star/lang/XMultiServiceFactory.hpp
-    - com/sun/star/uno/XComponentContext.hpp
-    # Needed for rtl::math::round
-    - rtl/math.hxx
-    writerfilter/source/dmapper/NumberingManager.cxx:
-    # Actually used
-    - com/sun/star/lang/XMultiServiceFactory.hpp
-    - com/sun/star/container/XNameContainer.hpp
-    writerfilter/source/dmapper/DomainMapper_Impl.cxx:
-    # Actually used
-    - com/sun/star/uno/XComponentContext.hpp
-    writerfilter/source/dmapper/OLEHandler.cxx:
-    # Actually used
-    - com/sun/star/drawing/XShape.hpp
-    - com/sun/star/graphic/XGraphic.hpp
-    - com/sun/star/text/XTextDocument.hpp
-    - com/sun/star/text/WrapTextMode.hpp
-    - com/sun/star/uno/XComponentContext.hpp
-    writerfilter/source/dmapper/TDefTableHandler.cxx:
-    # Needed for method parameter type
-    - tools/color.hxx
-    writerfilter/source/dmapper/TablePositionHandler.cxx:
-    # Actually used
-    - com/sun/star/beans/PropertyValue.hpp
-    writerfilter/source/dmapper/PropertyMap.cxx:
-    # Actually used
-    - com/sun/star/beans/PropertyValue.hpp
-    - com/sun/star/text/XTextColumns.hpp
-    writerfilter/source/dmapper/StyleSheetTable.cxx:
-    # Actually used
-    - com/sun/star/text/XTextDocument.hpp
-    writerfilter/source/ooxml/OOXMLPropertySet.cxx:
-    # Actually used
-    - com/sun/star/drawing/XShape.hpp
-    writerfilter/source/rtftok/rtfsdrimport.hxx:
-    # IWYU assumes std::stack<IncompleteType> in a header is OK, but that's not
-    # the case for all of LO's supported platforms.
-    # See <https://github.com/include-what-you-use/include-what-you-use/issues/175>.
-    - dmapper/GraphicZOrderHelper.hxx
-    writerfilter/source/rtftok/rtfvalue.cxx:
-    # complete type is needed
-    - com/sun/star/embed/XEmbeddedObject.hpp
-    writerfilter/source/rtftok/rtftokenizer.cxx:
-    # Actually used
-    - com/sun/star/task/XStatusIndicator.hpp
-    writerfilter/source/filter/RtfFilter.cxx:
-    - comphelper/scopeguard.hxx
-    writerfilter/source/filter/WriterFilter.cxx:
-    - comphelper/scopeguard.hxx
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
deleted file mode 100644
index 85afb7e598cd..000000000000
--- a/writerfilter/Library_writerfilter.mk
+++ /dev/null
@@ -1,141 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Library_Library,writerfilter))
-
-$(eval $(call gb_Library_use_custom_headers,writerfilter,\
-	officecfg/registry \
-	oox/generated \
-	writerfilter/source \
-))
-
-$(eval $(call gb_Library_set_precompiled_header,writerfilter,writerfilter/inc/pch/precompiled_writerfilter))
-
-$(eval $(call gb_Library_set_include,writerfilter,\
-    $$(INCLUDE) \
-    -I$(SRCDIR)/writerfilter/inc \
-    -I$(SRCDIR)/writerfilter/source \
-))
-
-$(eval $(call gb_Library_use_sdk_api,writerfilter))
-
-$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter,services))
-
-$(eval $(call gb_Library_use_libraries,writerfilter,\
-    basegfx \
-    comphelper \
-    cppu \
-    cppuhelper \
-    docmodel \
-    editeng \
-    i18nlangtag \
-    i18nutil \
-    msfilter \
-    oox \
-    sal \
-    salhelper \
-    sax \
-    sfx \
-    sot \
-    svt \
-	svxcore \
-    tl \
-    utl \
-    vcl \
-))
-
-$(eval $(call gb_Library_use_externals,writerfilter,\
-	boost_headers \
-	icui18n \
-	icuuc \
-	icu_headers \
-	libxml2 \
-	frozen \
-))
-
-$(eval $(call gb_Library_add_exception_objects,writerfilter,\
-	writerfilter/source/rtftok/rtfcharsets \
-	writerfilter/source/rtftok/rtfcontrolwords \
-	writerfilter/source/rtftok/rtfdispatchdestination \
-	writerfilter/source/rtftok/rtfdispatchflag \
-	writerfilter/source/rtftok/rtfdispatchsymbol \
-	writerfilter/source/rtftok/rtfdispatchvalue \
-	writerfilter/source/rtftok/rtfdocumentfactory \
-	writerfilter/source/rtftok/rtfdocumentimpl \
-	writerfilter/source/rtftok/rtflookahead \
-	writerfilter/source/rtftok/rtfreferenceproperties \
-	writerfilter/source/rtftok/rtfreferencetable \
-	writerfilter/source/rtftok/rtfsdrimport \
-	writerfilter/source/rtftok/rtfskipdestination \
-	writerfilter/source/rtftok/rtfsprm \
-	writerfilter/source/rtftok/rtftokenizer \
-	writerfilter/source/rtftok/rtfvalue \
-    writerfilter/source/dmapper/BorderHandler \
-    writerfilter/source/dmapper/CellColorHandler \
-    writerfilter/source/dmapper/CellMarginHandler \
-    writerfilter/source/dmapper/ConversionHelper \
-	writerfilter/source/dmapper/DocumentProtection \
-    writerfilter/source/dmapper/DomainMapper \
-    writerfilter/source/dmapper/DomainMapperTableHandler \
-    writerfilter/source/dmapper/DomainMapperTableManager \
-    writerfilter/source/dmapper/DomainMapper_Impl \
-	writerfilter/source/dmapper/domainmapperfactory \
-    writerfilter/source/dmapper/FFDataHandler \
-    writerfilter/source/dmapper/FontTable \
-    writerfilter/source/dmapper/FormControlHelper \
-    writerfilter/source/dmapper/GraphicHelpers \
-    writerfilter/source/dmapper/GraphicImport \
-    writerfilter/source/dmapper/LatentStyleHandler \
-    writerfilter/source/dmapper/LoggedResources \
-    writerfilter/source/dmapper/MeasureHandler \
-    writerfilter/source/dmapper/TrackChangesHandler \
-    writerfilter/source/dmapper/ModelEventListener \
-    writerfilter/source/dmapper/NumberingManager \
-    writerfilter/source/dmapper/OLEHandler \
-    writerfilter/source/dmapper/PageBordersHandler \
-    writerfilter/source/dmapper/PropertyIds \
-    writerfilter/source/dmapper/PropertyMap \
-    writerfilter/source/dmapper/PropertyMapHelper \
-    writerfilter/source/dmapper/SdtHelper \
-    writerfilter/source/dmapper/SectionColumnHandler \
-    writerfilter/source/dmapper/SettingsTable \
-    writerfilter/source/dmapper/SmartTagHandler \
-    writerfilter/source/dmapper/StyleSheetTable \
-    writerfilter/source/dmapper/TDefTableHandler \
-    writerfilter/source/dmapper/TableManager \
-    writerfilter/source/dmapper/TablePositionHandler \
-    writerfilter/source/dmapper/TablePropertiesHandler \
-	writerfilter/source/dmapper/TagLogger \
-    writerfilter/source/dmapper/TextEffectsHandler \
-    writerfilter/source/dmapper/TblStylePrHandler \
-    writerfilter/source/dmapper/ThemeHandler \
-    writerfilter/source/dmapper/WrapPolygonHandler \
-	writerfilter/source/dmapper/WriteProtection \
-    writerfilter/source/dmapper/util \
-    writerfilter/source/filter/RtfFilter \
-    writerfilter/source/filter/WriterFilter \
-    writerfilter/source/ooxml/Handler \
-    writerfilter/source/ooxml/OOXMLBinaryObjectReference \
-    writerfilter/source/ooxml/OOXMLDocumentImpl \
-    writerfilter/source/ooxml/OOXMLFactory \
-    writerfilter/source/ooxml/OOXMLFastContextHandler \
-    writerfilter/source/ooxml/OOXMLFastContextHandlerTheme \
-    writerfilter/source/ooxml/OOXMLFastDocumentHandler \
-    writerfilter/source/ooxml/OOXMLParserState \
-    writerfilter/source/ooxml/OOXMLPropertySet \
-    writerfilter/source/ooxml/OOXMLStreamImpl \
-))
-
-$(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\
-    $(patsubst %,CustomTarget/writerfilter/source/ooxml/OOXMLFactory_%,$(writerfilter_OOXMLNAMESPACES)) \
-    CustomTarget/writerfilter/source/ooxml/OOXMLFactory_generated \
-    CustomTarget/writerfilter/source/ooxml/qnametostr \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Makefile b/writerfilter/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/writerfilter/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
deleted file mode 100644
index 587bf4fa4dfc..000000000000
--- a/writerfilter/Module_writerfilter.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Module_Module,writerfilter))
-
-$(eval $(call gb_Module_add_targets,writerfilter,\
-    CustomTarget_source \
-    Library_writerfilter \
-))
-
-$(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\
-    CppunitTest_writerfilter_filters_test \
-    CppunitTest_writerfilter_misc \
-    CppunitTest_writerfilter_dmapper \
-    CppunitTest_writerfilter_ooxml \
-    CppunitTest_writerfilter_rtftok \
-))
-
-# vim: set noet sw=4 ts=4: