core.git: bin/find-german-comments bin/update_pch chart2/CppunitTest_chart2_dump.mk chart2/CppunitTest_chart2_geometry.mk chart2/CppunitTest_chart2_pivot_chart_test.mk chart2/CppunitTest_chart2_trendcalculators.mk chart2/CppunitTest_chart2_xshape.mk chart2/import_setup.mk compilerplugins/clang Repository.mk RepositoryModule_host.mk solenv/bin solenv/clang-format solenv/gbuild sw/CppunitTest_sw_writerfilter_dmapper.mk sw/CppunitTest_sw_writerfilter_filters_test.mk sw/CppunitTest_sw_writerfilter_misc.mk sw/CppunitTest_sw_writerfilter_ooxml.mk sw/CppunitTest_sw_writerfilter_rtftok.mk sw/CustomTarget_source.mk sw/documentation sw/inc sw/IwyuFilter_sw.yaml sw/Library_sw_writerfilter.mk sw/Module_sw.mk sw/qa sw/README.writerfilter.md sw/source sw/util vcl/commonfuzzer.mk writerfilter/CppunitTest_writerfilter_dmapper.mk writerfilter/CppunitTest_writerfilter_filters_test.mk writerfilter/CppunitTest_writerfilter_misc.mk writerfilter/CppunitTest_writerfilter_ooxml.mk writerfilter/Cppu nitTest_writerfilter_rtftok.mk writerfilter/CustomTarget_source.mk writerfilter/documentation writerfilter/inc writerfilter/IwyuFilter_writerfilter.yaml writerfilter/Library_writerfilter.mk writerfilter/Makefile writerfilter/Module_writerfilter.mk writerfilter/qa writerfilter/README.md writerfilter/source writerfilter/util

[Noel Grandin (via logerrit)]

 Repository.mk                                                        |    2 
 RepositoryModule_host.mk                                             |    3 
 bin/find-german-comments                                             |    1 
 bin/update_pch                                                       |    2 
 chart2/CppunitTest_chart2_dump.mk                                    |    2 
 chart2/CppunitTest_chart2_geometry.mk                                |    2 
 chart2/CppunitTest_chart2_pivot_chart_test.mk                        |    2 
 chart2/CppunitTest_chart2_trendcalculators.mk                        |    2 
 chart2/CppunitTest_chart2_xshape.mk                                  |    2 
 chart2/import_setup.mk                                               |    2 
 compilerplugins/clang/bufferadd.cxx                                  |    6 
 compilerplugins/clang/buriedassign.cxx                               |    4 
 compilerplugins/clang/unusedenumconstants.py                         |    4 
 compilerplugins/clang/virtualdead.py                                 |    2 
 solenv/bin/install-gdb-printers                                      |    2 
 solenv/bin/native-code.py                                            |    2 
 solenv/clang-format/excludelist                                      |  136 
++++-----
 solenv/gbuild/extensions/pre_MergedLibsList.mk                       |    2 
 sw/CppunitTest_sw_writerfilter_dmapper.mk                            |   65 
++++
 sw/CppunitTest_sw_writerfilter_filters_test.mk                       |   61 
++++
 sw/CppunitTest_sw_writerfilter_misc.mk                               |   39 ++
 sw/CppunitTest_sw_writerfilter_ooxml.mk                              |   54 +++
 sw/CppunitTest_sw_writerfilter_rtftok.mk                             |   61 
++++
 sw/CustomTarget_source.mk                                            |   12 
 sw/IwyuFilter_sw.yaml                                                |   63 
++++
 sw/Library_sw_writerfilter.mk                                        |  141 
++++++++++
 sw/Module_sw.mk                                                      |    7 
 sw/inc/pch/precompiled_sw_writerfilter.cxx                           |    2 
 sw/inc/pch/precompiled_sw_writerfilter.hxx                           |   38 ++
 sw/qa/writerfilter/cppunittests/dmapper/CellColorHandler.cxx         |    4 
 sw/qa/writerfilter/cppunittests/dmapper/DomainMapper.cxx             |    4 
 sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableHandler.cxx |    4 
 sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableManager.cxx |    4 
 sw/qa/writerfilter/cppunittests/dmapper/DomainMapper_Impl.cxx        |    4 
 sw/qa/writerfilter/cppunittests/dmapper/GraphicImport.cxx            |    4 
 sw/qa/writerfilter/cppunittests/dmapper/PropertyMap.cxx              |    4 
 sw/qa/writerfilter/cppunittests/dmapper/SdtHelper.cxx                |    4 
 sw/qa/writerfilter/cppunittests/dmapper/SettingsTable.cxx            |    4 
 sw/qa/writerfilter/cppunittests/dmapper/TableManager.cxx             |    4 
 sw/qa/writerfilter/cppunittests/dmapper/TextEffectsHandler.cxx       |    4 
 sw/qa/writerfilter/cppunittests/filters-test/filters-test.cxx        |    4 
 sw/qa/writerfilter/cppunittests/ooxml/ooxml.cxx                      |    4 
 sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchflag.cxx           |    4 
 sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchsymbol.cxx         |    4 
 sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchvalue.cxx          |    4 
 sw/qa/writerfilter/cppunittests/rtftok/rtfdocumentimpl.cxx           |    4 
 sw/qa/writerfilter/cppunittests/rtftok/rtfsdrimport.cxx              |    4 
 sw/qa/writerfilter/cppunittests/rtftok/rtfsprm.cxx                   |    4 
 sw/qa/writerfilter/cppunittests/rtftok/rtftokenizer.cxx              |    4 
 sw/source/writerfilter/rtftok/README                                 |    2 
 vcl/commonfuzzer.mk                                                  |    2 
 writerfilter/CppunitTest_writerfilter_dmapper.mk                     |   65 
----
 writerfilter/CppunitTest_writerfilter_filters_test.mk                |   61 
----
 writerfilter/CppunitTest_writerfilter_misc.mk                        |   39 --
 writerfilter/CppunitTest_writerfilter_ooxml.mk                       |   54 ---
 writerfilter/CppunitTest_writerfilter_rtftok.mk                      |   61 
----
 writerfilter/IwyuFilter_writerfilter.yaml                            |   66 
----
 writerfilter/Library_writerfilter.mk                                 |  141 
----------
 writerfilter/Makefile                                                |    7 
 writerfilter/Module_writerfilter.mk                                  |   25 -
 60 files changed, 659 insertions(+), 665 deletions(-)

New commits:
commit 828c1999e08c5bfad0a1d0e6e5ab07ee8bbc427e
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Apr 10 16:50:51 2024 +0100
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Apr 18 09:16:12 2024 +0200

    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.gran...@collabora.co.uk>
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

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
similarity index 90%
rename from writerfilter/CustomTarget_source.mk
rename to 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
similarity index 100%
rename from writerfilter/README.md
rename to sw/README.writerfilter.md
diff --git a/writerfilter/documentation/KnownIssues.txt 
b/sw/documentation/writerfilter/KnownIssues.txt
similarity index 100%
rename from writerfilter/documentation/KnownIssues.txt
rename to sw/documentation/writerfilter/KnownIssues.txt
diff --git a/writerfilter/documentation/TODO 
b/sw/documentation/writerfilter/TODO
similarity index 100%
rename from writerfilter/documentation/TODO
rename to sw/documentation/writerfilter/TODO
diff --git a/writerfilter/documentation/doxygen/Doxyfile 
b/sw/documentation/writerfilter/doxygen/Doxyfile
similarity index 100%
rename from writerfilter/documentation/doxygen/Doxyfile
rename to sw/documentation/writerfilter/doxygen/Doxyfile
diff --git a/writerfilter/documentation/doxygen/images/doctok.png 
b/sw/documentation/writerfilter/doxygen/images/doctok.png
similarity index 100%
rename from writerfilter/documentation/doxygen/images/doctok.png
rename to sw/documentation/writerfilter/doxygen/images/doctok.png
diff --git a/writerfilter/documentation/doxygen/images/ooxmlimportchain.png 
b/sw/documentation/writerfilter/doxygen/images/ooxmlimportchain.png
similarity index 100%
rename from writerfilter/documentation/doxygen/images/ooxmlimportchain.png
rename to sw/documentation/writerfilter/doxygen/images/ooxmlimportchain.png
diff --git a/writerfilter/documentation/ooxml/model.rng 
b/sw/documentation/writerfilter/ooxml/model.rng
similarity index 100%
rename from writerfilter/documentation/ooxml/model.rng
rename to sw/documentation/writerfilter/ooxml/model.rng
diff --git a/writerfilter/documentation/sprms.txt 
b/sw/documentation/writerfilter/sprms.txt
similarity index 100%
rename from writerfilter/documentation/sprms.txt
rename to sw/documentation/writerfilter/sprms.txt
diff --git a/writerfilter/documentation/tablesInDoc.txt 
b/sw/documentation/writerfilter/tablesInDoc.txt
similarity index 100%
rename from writerfilter/documentation/tablesInDoc.txt
rename to sw/documentation/writerfilter/tablesInDoc.txt
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.cxx 
b/sw/inc/pch/precompiled_sw_writerfilter.cxx
similarity index 90%
rename from writerfilter/inc/pch/precompiled_writerfilter.cxx
rename to 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
similarity index 78%
rename from writerfilter/inc/pch/precompiled_writerfilter.hxx
rename to 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
similarity index 92%
rename from writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
rename to 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
similarity index 98%
rename from writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
rename to 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
similarity index 98%
rename from writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
rename to 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
similarity index 91%
rename from writerfilter/qa/cppunittests/dmapper/DomainMapperTableManager.cxx
rename to 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
similarity index 99%
rename from writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
rename to 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
similarity index 99%
rename from writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
rename to 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
similarity index 98%
rename from writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
rename to 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
similarity index 99%
rename from writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx
rename to 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
similarity index 96%
rename from writerfilter/qa/cppunittests/dmapper/SettingsTable.cxx
rename to 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
similarity index 91%
rename from writerfilter/qa/cppunittests/dmapper/TableManager.cxx
rename to 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
similarity index 95%
rename from writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/1cell-insidev-rightborder.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/alt-chunk.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/chart-zorder.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/clearing-break.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/content-control-data-binding-color.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/content-control-date-data-binding.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/create-date-preserve.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/do-not-break-wrapped-tables.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/draw-shape-inline-effect.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/fdo78333-1-minimized.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/field-if-inside-if.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/floating-table-header.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floating-table-section-break.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-break-before.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-footnote-redline.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-header-overlap.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/floattable-header.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-hidden-anchor.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-nested-3tables.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-nested-cellstart.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/floattable-nested.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-outer-nonsplit-inner.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/floattable-sectend.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-tbl-overlap.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/floattable-then-table.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-vertical-frame-offset.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/floattable-wrap-on-all-pages.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/follow-page-top-margin.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/frame-direction.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/group-shape-rotation.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/inline-anchored-zorder.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/large-para-top-margin.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-2.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/negative-page-border-no-margin.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/negative-page-border.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/nested-floating-table.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/num-restart-style-parent.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/paste-ole.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/ptab.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/redlined-shape-sdt.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/relfromh-insidemargin.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/sdt-block-text.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/sdt-run-checkbox.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/sdt-run-combobox.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/sdt-run-dropdown.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/sdt-run-in-para.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/sdt-run-picture.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/sdt-run-plain-text.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/sdt-run-rich-text.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/semi-transparent-text.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/table-negative-vertical-pos.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/tdf129205.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf141540ChildRotation.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf141540GroupLinePosSize.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf141540GroupRotation.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf142304GroupPosition.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf142305SquareWrapMargin.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf142305StrokeGlowMargin.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/tdf143208_wrapTight.docx
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf143455_SmartArtPosition.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf149840_SmartArtBackground.docx
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/dmapper/data/tdf152884_Char_Transparency.docx
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/tdf158360.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/textbox-textline-top.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/textbox-textline.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/dmapper/data/wrap-poly-crop.docx
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/README
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/destinationtest-2.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/fail/popstate-1.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/fail/popstate-2.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/fail/propheight-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-5.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-6.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/fail/tablemanager-7.rtf
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-1.rtf
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-2.rtf
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/fail/topcontext-3.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/indeterminate/.gitignore
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/abi3623.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/abi4817.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/fdo49666.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/fdo64656.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/i74153.rtf
rename to 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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/i84172.rtf
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/parser-state-1.rtf
rename to 
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
similarity index 100%
rename from writerfilter/qa/cppunittests/filters-test/data/pass/rhbz960019.rtf
rename to 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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
rename to 
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
similarity index 100%
rename from 
writerfilter/qa/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
rename to 
sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
-e 
... etc. - the rest is truncated