sw/CppunitTest_sw_writerfilter_dmapper.mk | 22 ++++++++--------
sw/CppunitTest_sw_writerfilter_filter.mk | 2 -
sw/CppunitTest_sw_writerfilter_filters_test.mk | 2 -
sw/CppunitTest_sw_writerfilter_misc.mk | 2 -
sw/CppunitTest_sw_writerfilter_ooxml.mk | 2 -
sw/CppunitTest_sw_writerfilter_rtftok.mk | 14 +++++-----
sw/qa/writerfilter/dmapper/CellColorHandler.cxx | 2 -
sw/qa/writerfilter/dmapper/DomainMapper.cxx | 2 -
sw/qa/writerfilter/dmapper/DomainMapperTableHandler.cxx | 2 -
sw/qa/writerfilter/dmapper/DomainMapperTableManager.cxx | 2 -
sw/qa/writerfilter/dmapper/DomainMapper_Impl.cxx | 2 -
sw/qa/writerfilter/dmapper/GraphicImport.cxx | 2 -
sw/qa/writerfilter/dmapper/PropertyMap.cxx | 2 -
sw/qa/writerfilter/dmapper/SdtHelper.cxx | 2 -
sw/qa/writerfilter/dmapper/SettingsTable.cxx | 2 -
sw/qa/writerfilter/dmapper/TableManager.cxx | 2 -
sw/qa/writerfilter/dmapper/TextEffectsHandler.cxx | 2 -
sw/qa/writerfilter/filter/WriterFilter.cxx | 2 -
sw/qa/writerfilter/filters-test/filters-test.cxx | 3 --
sw/qa/writerfilter/ooxml/ooxml.cxx | 2 -
sw/qa/writerfilter/rtftok/rtfdispatchflag.cxx | 2 -
sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx | 2 -
sw/qa/writerfilter/rtftok/rtfdispatchvalue.cxx | 2 -
sw/qa/writerfilter/rtftok/rtfdocumentimpl.cxx | 2 -
sw/qa/writerfilter/rtftok/rtfsdrimport.cxx | 2 -
sw/qa/writerfilter/rtftok/rtfsprm.cxx | 2 -
sw/qa/writerfilter/rtftok/rtftokenizer.cxx | 2 -
27 files changed, 43 insertions(+), 44 deletions(-)
New commits:
commit 8112883acf0015066f21dece7e1109dbda3e4cae
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri May 24 16:07:55 2024 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri May 24 17:34:09 2024 +0200
sw qa: rename writerfilter/cppunittests to just writerfilter
15:47 <vmiklos> noelgrandin: any objections to go further with your
writerfilter rename and turn sw/qa/writerfilter/cppunittests/* into
sw/qa/writerfilter/* ? (suggest to either do it now or not at all if we're past
the libreoffice-24-8 branch-off)
15:59 <noelgrandin> vmiklos, not at all, go for it
Change-Id: Ic0eb6907463389f3be326cdf183002f1bfcb42be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168024
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/CppunitTest_sw_writerfilter_dmapper.mk
b/sw/CppunitTest_sw_writerfilter_dmapper.mk
index ecae5cf7db7e..d865706c2b50 100644
--- a/sw/CppunitTest_sw_writerfilter_dmapper.mk
+++ b/sw/CppunitTest_sw_writerfilter_dmapper.mk
@@ -17,17 +17,17 @@ $(eval $(call
gb_CppunitTest_use_externals,sw_writerfilter_dmapper,\
))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_dmapper, \
- sw/qa/writerfilter/cppunittests/dmapper/CellColorHandler \
- sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableHandler \
- sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableManager \
- sw/qa/writerfilter/cppunittests/dmapper/DomainMapper \
- sw/qa/writerfilter/cppunittests/dmapper/DomainMapper_Impl \
- sw/qa/writerfilter/cppunittests/dmapper/GraphicImport \
- sw/qa/writerfilter/cppunittests/dmapper/TableManager \
- sw/qa/writerfilter/cppunittests/dmapper/TextEffectsHandler \
- sw/qa/writerfilter/cppunittests/dmapper/PropertyMap \
- sw/qa/writerfilter/cppunittests/dmapper/SdtHelper \
- sw/qa/writerfilter/cppunittests/dmapper/SettingsTable \
+ sw/qa/writerfilter/dmapper/CellColorHandler \
+ sw/qa/writerfilter/dmapper/DomainMapperTableHandler \
+ sw/qa/writerfilter/dmapper/DomainMapperTableManager \
+ sw/qa/writerfilter/dmapper/DomainMapper \
+ sw/qa/writerfilter/dmapper/DomainMapper_Impl \
+ sw/qa/writerfilter/dmapper/GraphicImport \
+ sw/qa/writerfilter/dmapper/TableManager \
+ sw/qa/writerfilter/dmapper/TextEffectsHandler \
+ sw/qa/writerfilter/dmapper/PropertyMap \
+ sw/qa/writerfilter/dmapper/SdtHelper \
+ sw/qa/writerfilter/dmapper/SettingsTable \
))
$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_dmapper, \
diff --git a/sw/CppunitTest_sw_writerfilter_filter.mk
b/sw/CppunitTest_sw_writerfilter_filter.mk
index ad61c66f1ed4..e627d43d2180 100644
--- a/sw/CppunitTest_sw_writerfilter_filter.mk
+++ b/sw/CppunitTest_sw_writerfilter_filter.mk
@@ -17,7 +17,7 @@ $(eval $(call
gb_CppunitTest_use_externals,sw_writerfilter_filter,\
))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_filter, \
- sw/qa/writerfilter/cppunittests/filter/WriterFilter \
+ sw/qa/writerfilter/filter/WriterFilter \
))
$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_filter, \
diff --git a/sw/CppunitTest_sw_writerfilter_filters_test.mk
b/sw/CppunitTest_sw_writerfilter_filters_test.mk
index 2f1f99f3184b..2c1212d60768 100644
--- a/sw/CppunitTest_sw_writerfilter_filters_test.mk
+++ b/sw/CppunitTest_sw_writerfilter_filters_test.mk
@@ -14,7 +14,7 @@ $(eval $(call
gb_CppunitTest_CppunitTest,sw_writerfilter_filters_test))
$(eval $(call
gb_CppunitTest_use_external,sw_writerfilter_filters_test,boost_headers))
$(eval $(call
gb_CppunitTest_add_exception_objects,sw_writerfilter_filters_test, \
- sw/qa/writerfilter/cppunittests/filters-test/filters-test \
+ sw/qa/writerfilter/filters-test/filters-test \
))
ifeq ($(DISABLE_CVE_TESTS),TRUE)
diff --git a/sw/CppunitTest_sw_writerfilter_misc.mk
b/sw/CppunitTest_sw_writerfilter_misc.mk
index 8ff6cbe94a24..c1f36dd28996 100644
--- a/sw/CppunitTest_sw_writerfilter_misc.mk
+++ b/sw/CppunitTest_sw_writerfilter_misc.mk
@@ -32,7 +32,7 @@ $(eval $(call
gb_CppunitTest_use_libraries,sw_writerfilter_misc, \
))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_misc, \
- sw/qa/writerfilter/cppunittests/misc/misc \
+ sw/qa/writerfilter/misc/misc \
))
diff --git a/sw/CppunitTest_sw_writerfilter_ooxml.mk
b/sw/CppunitTest_sw_writerfilter_ooxml.mk
index ddb371813d7c..d7faae578f4f 100644
--- a/sw/CppunitTest_sw_writerfilter_ooxml.mk
+++ b/sw/CppunitTest_sw_writerfilter_ooxml.mk
@@ -16,7 +16,7 @@ $(eval $(call
gb_CppunitTest_use_externals,sw_writerfilter_ooxml,\
))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_ooxml, \
- sw/qa/writerfilter/cppunittests/ooxml/ooxml \
+ sw/qa/writerfilter/ooxml/ooxml \
))
$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_ooxml, \
diff --git a/sw/CppunitTest_sw_writerfilter_rtftok.mk
b/sw/CppunitTest_sw_writerfilter_rtftok.mk
index b5009ca77c31..67207f27a9ae 100644
--- a/sw/CppunitTest_sw_writerfilter_rtftok.mk
+++ b/sw/CppunitTest_sw_writerfilter_rtftok.mk
@@ -17,13 +17,13 @@ $(eval $(call
gb_CppunitTest_use_externals,sw_writerfilter_rtftok,\
))
$(eval $(call gb_CppunitTest_add_exception_objects,sw_writerfilter_rtftok, \
- sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchflag \
- sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchsymbol \
- sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchvalue \
- sw/qa/writerfilter/cppunittests/rtftok/rtfdocumentimpl \
- sw/qa/writerfilter/cppunittests/rtftok/rtfsdrimport \
- sw/qa/writerfilter/cppunittests/rtftok/rtfsprm \
- sw/qa/writerfilter/cppunittests/rtftok/rtftokenizer \
+ sw/qa/writerfilter/rtftok/rtfdispatchflag \
+ sw/qa/writerfilter/rtftok/rtfdispatchsymbol \
+ sw/qa/writerfilter/rtftok/rtfdispatchvalue \
+ sw/qa/writerfilter/rtftok/rtfdocumentimpl \
+ sw/qa/writerfilter/rtftok/rtfsdrimport \
+ sw/qa/writerfilter/rtftok/rtfsprm \
+ sw/qa/writerfilter/rtftok/rtftokenizer \
))
$(eval $(call gb_CppunitTest_use_libraries,sw_writerfilter_rtftok, \
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/CellColorHandler.cxx
b/sw/qa/writerfilter/dmapper/CellColorHandler.cxx
similarity index 96%
rename from sw/qa/writerfilter/cppunittests/dmapper/CellColorHandler.cxx
rename to sw/qa/writerfilter/dmapper/CellColorHandler.cxx
index f7904c95fb9a..fcf7d53708d6 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/CellColorHandler.cxx
+++ b/sw/qa/writerfilter/dmapper/CellColorHandler.cxx
@@ -22,7 +22,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/DomainMapper.cxx
b/sw/qa/writerfilter/dmapper/DomainMapper.cxx
similarity index 99%
rename from sw/qa/writerfilter/cppunittests/dmapper/DomainMapper.cxx
rename to sw/qa/writerfilter/dmapper/DomainMapper.cxx
index 4a69c4520f07..5c6b429bc9f6 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/DomainMapper.cxx
+++ b/sw/qa/writerfilter/dmapper/DomainMapper.cxx
@@ -25,7 +25,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableHandler.cxx
b/sw/qa/writerfilter/dmapper/DomainMapperTableHandler.cxx
similarity index 99%
rename from sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableHandler.cxx
rename to sw/qa/writerfilter/dmapper/DomainMapperTableHandler.cxx
index 0283f80e9ceb..bfcbf09fe130 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableHandler.cxx
+++ b/sw/qa/writerfilter/dmapper/DomainMapperTableHandler.cxx
@@ -30,7 +30,7 @@ class Test : public UnoApiXmlTest
{
public:
Test()
- : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiXmlTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableManager.cxx
b/sw/qa/writerfilter/dmapper/DomainMapperTableManager.cxx
similarity index 95%
rename from sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableManager.cxx
rename to sw/qa/writerfilter/dmapper/DomainMapperTableManager.cxx
index 420ae2a18330..be746062e655 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/DomainMapperTableManager.cxx
+++ b/sw/qa/writerfilter/dmapper/DomainMapperTableManager.cxx
@@ -21,7 +21,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/DomainMapper_Impl.cxx
b/sw/qa/writerfilter/dmapper/DomainMapper_Impl.cxx
similarity index 99%
rename from sw/qa/writerfilter/cppunittests/dmapper/DomainMapper_Impl.cxx
rename to sw/qa/writerfilter/dmapper/DomainMapper_Impl.cxx
index fcbc933b18a0..825e615fb574 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/sw/qa/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -33,7 +33,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/GraphicImport.cxx
b/sw/qa/writerfilter/dmapper/GraphicImport.cxx
similarity index 99%
rename from sw/qa/writerfilter/cppunittests/dmapper/GraphicImport.cxx
rename to sw/qa/writerfilter/dmapper/GraphicImport.cxx
index c48e15851747..35c1988c9b02 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/GraphicImport.cxx
+++ b/sw/qa/writerfilter/dmapper/GraphicImport.cxx
@@ -32,7 +32,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/PropertyMap.cxx
b/sw/qa/writerfilter/dmapper/PropertyMap.cxx
similarity index 99%
rename from sw/qa/writerfilter/cppunittests/dmapper/PropertyMap.cxx
rename to sw/qa/writerfilter/dmapper/PropertyMap.cxx
index 78e231e483cd..d0e8533e1acb 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/PropertyMap.cxx
+++ b/sw/qa/writerfilter/dmapper/PropertyMap.cxx
@@ -31,7 +31,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/SdtHelper.cxx
b/sw/qa/writerfilter/dmapper/SdtHelper.cxx
similarity index 99%
rename from sw/qa/writerfilter/cppunittests/dmapper/SdtHelper.cxx
rename to sw/qa/writerfilter/dmapper/SdtHelper.cxx
index b5e60e1035dc..434b685790c0 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/SdtHelper.cxx
+++ b/sw/qa/writerfilter/dmapper/SdtHelper.cxx
@@ -24,7 +24,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/SettingsTable.cxx
b/sw/qa/writerfilter/dmapper/SettingsTable.cxx
similarity index 98%
rename from sw/qa/writerfilter/cppunittests/dmapper/SettingsTable.cxx
rename to sw/qa/writerfilter/dmapper/SettingsTable.cxx
index f8305efb5315..503b28d45c95 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/SettingsTable.cxx
+++ b/sw/qa/writerfilter/dmapper/SettingsTable.cxx
@@ -23,7 +23,7 @@ class Test : public UnoApiXmlTest
{
public:
Test()
- : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiXmlTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/TableManager.cxx
b/sw/qa/writerfilter/dmapper/TableManager.cxx
similarity index 95%
rename from sw/qa/writerfilter/cppunittests/dmapper/TableManager.cxx
rename to sw/qa/writerfilter/dmapper/TableManager.cxx
index 45dc968c0f22..51609a006a14 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/TableManager.cxx
+++ b/sw/qa/writerfilter/dmapper/TableManager.cxx
@@ -20,7 +20,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/TextEffectsHandler.cxx
b/sw/qa/writerfilter/dmapper/TextEffectsHandler.cxx
similarity index 97%
rename from sw/qa/writerfilter/cppunittests/dmapper/TextEffectsHandler.cxx
rename to sw/qa/writerfilter/dmapper/TextEffectsHandler.cxx
index c14496179dc6..7bd4788ba0d5 100644
--- a/sw/qa/writerfilter/cppunittests/dmapper/TextEffectsHandler.cxx
+++ b/sw/qa/writerfilter/dmapper/TextEffectsHandler.cxx
@@ -21,7 +21,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/dmapper/data/")
+ : UnoApiTest("/sw/qa/writerfilter/dmapper/data/")
{
}
};
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/1cell-insidev-rightborder.docx
b/sw/qa/writerfilter/dmapper/data/1cell-insidev-rightborder.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/1cell-insidev-rightborder.docx
rename to sw/qa/writerfilter/dmapper/data/1cell-insidev-rightborder.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/alt-chunk.docx
b/sw/qa/writerfilter/dmapper/data/alt-chunk.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/alt-chunk.docx
rename to sw/qa/writerfilter/dmapper/data/alt-chunk.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/chart-zorder.docx
b/sw/qa/writerfilter/dmapper/data/chart-zorder.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/chart-zorder.docx
rename to sw/qa/writerfilter/dmapper/data/chart-zorder.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/clearing-break.docx
b/sw/qa/writerfilter/dmapper/data/clearing-break.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/clearing-break.docx
rename to sw/qa/writerfilter/dmapper/data/clearing-break.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/content-control-data-binding-color.docx
b/sw/qa/writerfilter/dmapper/data/content-control-data-binding-color.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/content-control-data-binding-color.docx
rename to
sw/qa/writerfilter/dmapper/data/content-control-data-binding-color.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/content-control-date-data-binding.docx
b/sw/qa/writerfilter/dmapper/data/content-control-date-data-binding.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/content-control-date-data-binding.docx
rename to sw/qa/writerfilter/dmapper/data/content-control-date-data-binding.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/create-date-preserve.docx
b/sw/qa/writerfilter/dmapper/data/create-date-preserve.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/create-date-preserve.docx
rename to sw/qa/writerfilter/dmapper/data/create-date-preserve.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/do-not-break-wrapped-tables.docx
b/sw/qa/writerfilter/dmapper/data/do-not-break-wrapped-tables.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/do-not-break-wrapped-tables.docx
rename to sw/qa/writerfilter/dmapper/data/do-not-break-wrapped-tables.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/draw-shape-inline-effect.docx
b/sw/qa/writerfilter/dmapper/data/draw-shape-inline-effect.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/draw-shape-inline-effect.docx
rename to sw/qa/writerfilter/dmapper/data/draw-shape-inline-effect.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/fdo78333-1-minimized.docx
b/sw/qa/writerfilter/dmapper/data/fdo78333-1-minimized.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/fdo78333-1-minimized.docx
rename to sw/qa/writerfilter/dmapper/data/fdo78333-1-minimized.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/field-if-inside-if.docx
b/sw/qa/writerfilter/dmapper/data/field-if-inside-if.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/field-if-inside-if.docx
rename to sw/qa/writerfilter/dmapper/data/field-if-inside-if.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floating-table-header.docx
b/sw/qa/writerfilter/dmapper/data/floating-table-header.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floating-table-header.docx
rename to sw/qa/writerfilter/dmapper/data/floating-table-header.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floating-table-section-break.docx
b/sw/qa/writerfilter/dmapper/data/floating-table-section-break.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floating-table-section-break.docx
rename to sw/qa/writerfilter/dmapper/data/floating-table-section-break.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-break-before.docx
b/sw/qa/writerfilter/dmapper/data/floattable-break-before.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-break-before.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-break-before.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-footnote-redline.docx
b/sw/qa/writerfilter/dmapper/data/floattable-footnote-redline.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-footnote-redline.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-footnote-redline.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-header-overlap.docx
b/sw/qa/writerfilter/dmapper/data/floattable-header-overlap.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-header-overlap.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-header-overlap.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-header.docx
b/sw/qa/writerfilter/dmapper/data/floattable-header.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/floattable-header.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-header.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-hidden-anchor.docx
b/sw/qa/writerfilter/dmapper/data/floattable-hidden-anchor.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-hidden-anchor.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-hidden-anchor.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested-3tables.docx
b/sw/qa/writerfilter/dmapper/data/floattable-nested-3tables.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested-3tables.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-nested-3tables.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested-cellstart.docx
b/sw/qa/writerfilter/dmapper/data/floattable-nested-cellstart.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested-cellstart.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-nested-cellstart.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested.docx
b/sw/qa/writerfilter/dmapper/data/floattable-nested.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/floattable-nested.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-nested.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-outer-nonsplit-inner.docx
b/sw/qa/writerfilter/dmapper/data/floattable-outer-nonsplit-inner.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-outer-nonsplit-inner.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-outer-nonsplit-inner.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-sectend.docx
b/sw/qa/writerfilter/dmapper/data/floattable-sectend.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/floattable-sectend.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-sectend.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-tbl-overlap.docx
b/sw/qa/writerfilter/dmapper/data/floattable-tbl-overlap.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-tbl-overlap.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-tbl-overlap.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-then-table.docx
b/sw/qa/writerfilter/dmapper/data/floattable-then-table.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-then-table.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-then-table.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-vertical-frame-offset.rtf
b/sw/qa/writerfilter/dmapper/data/floattable-vertical-frame-offset.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-vertical-frame-offset.rtf
rename to sw/qa/writerfilter/dmapper/data/floattable-vertical-frame-offset.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/floattable-wrap-on-all-pages.docx
b/sw/qa/writerfilter/dmapper/data/floattable-wrap-on-all-pages.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/floattable-wrap-on-all-pages.docx
rename to sw/qa/writerfilter/dmapper/data/floattable-wrap-on-all-pages.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/follow-page-top-margin.docx
b/sw/qa/writerfilter/dmapper/data/follow-page-top-margin.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/follow-page-top-margin.docx
rename to sw/qa/writerfilter/dmapper/data/follow-page-top-margin.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/frame-direction.docx
b/sw/qa/writerfilter/dmapper/data/frame-direction.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/frame-direction.docx
rename to sw/qa/writerfilter/dmapper/data/frame-direction.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/group-shape-rotation.docx
b/sw/qa/writerfilter/dmapper/data/group-shape-rotation.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/group-shape-rotation.docx
rename to sw/qa/writerfilter/dmapper/data/group-shape-rotation.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/inline-anchored-zorder.docx
b/sw/qa/writerfilter/dmapper/data/inline-anchored-zorder.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/inline-anchored-zorder.docx
rename to sw/qa/writerfilter/dmapper/data/inline-anchored-zorder.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx
b/sw/qa/writerfilter/dmapper/data/inline-inshape-anchored-zorder.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx
rename to sw/qa/writerfilter/dmapper/data/inline-inshape-anchored-zorder.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/large-para-top-margin.docx
b/sw/qa/writerfilter/dmapper/data/large-para-top-margin.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/large-para-top-margin.docx
rename to sw/qa/writerfilter/dmapper/data/large-para-top-margin.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/layout-in-cell-2.docx
b/sw/qa/writerfilter/dmapper/data/layout-in-cell-2.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/layout-in-cell-2.docx
rename to sw/qa/writerfilter/dmapper/data/layout-in-cell-2.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
b/sw/qa/writerfilter/dmapper/data/layout-in-cell-wrapnone-column.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/layout-in-cell-wrapnone-column.docx
rename to sw/qa/writerfilter/dmapper/data/layout-in-cell-wrapnone-column.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/negative-page-border-no-margin.docx
b/sw/qa/writerfilter/dmapper/data/negative-page-border-no-margin.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/negative-page-border-no-margin.docx
rename to sw/qa/writerfilter/dmapper/data/negative-page-border-no-margin.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/negative-page-border.docx
b/sw/qa/writerfilter/dmapper/data/negative-page-border.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/negative-page-border.docx
rename to sw/qa/writerfilter/dmapper/data/negative-page-border.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/nested-floating-table.docx
b/sw/qa/writerfilter/dmapper/data/nested-floating-table.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/nested-floating-table.docx
rename to sw/qa/writerfilter/dmapper/data/nested-floating-table.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/num-restart-style-parent.docx
b/sw/qa/writerfilter/dmapper/data/num-restart-style-parent.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/num-restart-style-parent.docx
rename to sw/qa/writerfilter/dmapper/data/num-restart-style-parent.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/page-break-footer-table.docx
b/sw/qa/writerfilter/dmapper/data/page-break-footer-table.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/page-break-footer-table.docx
rename to sw/qa/writerfilter/dmapper/data/page-break-footer-table.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/paste-ole.rtf
b/sw/qa/writerfilter/dmapper/data/paste-ole.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/paste-ole.rtf
rename to sw/qa/writerfilter/dmapper/data/paste-ole.rtf
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/ptab.docx
b/sw/qa/writerfilter/dmapper/data/ptab.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/ptab.docx
rename to sw/qa/writerfilter/dmapper/data/ptab.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/redlined-shape-sdt.docx
b/sw/qa/writerfilter/dmapper/data/redlined-shape-sdt.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/redlined-shape-sdt.docx
rename to sw/qa/writerfilter/dmapper/data/redlined-shape-sdt.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/relfromh-insidemargin.docx
b/sw/qa/writerfilter/dmapper/data/relfromh-insidemargin.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/relfromh-insidemargin.docx
rename to sw/qa/writerfilter/dmapper/data/relfromh-insidemargin.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-block-text.docx
b/sw/qa/writerfilter/dmapper/data/sdt-block-text.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/sdt-block-text.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-block-text.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx
b/sw/qa/writerfilter/dmapper/data/sdt-dropdown-no-display-text.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-dropdown-no-display-text.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-checkbox.docx
b/sw/qa/writerfilter/dmapper/data/sdt-run-checkbox.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-checkbox.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-run-checkbox.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-combobox.docx
b/sw/qa/writerfilter/dmapper/data/sdt-run-combobox.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-combobox.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-run-combobox.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-dropdown.docx
b/sw/qa/writerfilter/dmapper/data/sdt-run-dropdown.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-dropdown.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-run-dropdown.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-in-para.docx
b/sw/qa/writerfilter/dmapper/data/sdt-run-in-para.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-in-para.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-run-in-para.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-picture.docx
b/sw/qa/writerfilter/dmapper/data/sdt-run-picture.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-picture.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-run-picture.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-plain-text.docx
b/sw/qa/writerfilter/dmapper/data/sdt-run-plain-text.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-plain-text.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-run-plain-text.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-rich-text.docx
b/sw/qa/writerfilter/dmapper/data/sdt-run-rich-text.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/sdt-run-rich-text.docx
rename to sw/qa/writerfilter/dmapper/data/sdt-run-rich-text.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/semi-transparent-text.docx
b/sw/qa/writerfilter/dmapper/data/semi-transparent-text.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/semi-transparent-text.docx
rename to sw/qa/writerfilter/dmapper/data/semi-transparent-text.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/table-negative-vertical-pos.docx
b/sw/qa/writerfilter/dmapper/data/table-negative-vertical-pos.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/table-negative-vertical-pos.docx
rename to sw/qa/writerfilter/dmapper/data/table-negative-vertical-pos.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf129205.docx
b/sw/qa/writerfilter/dmapper/data/tdf129205.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/tdf129205.docx
rename to sw/qa/writerfilter/dmapper/data/tdf129205.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540ChildRotation.docx
b/sw/qa/writerfilter/dmapper/data/tdf141540ChildRotation.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540ChildRotation.docx
rename to sw/qa/writerfilter/dmapper/data/tdf141540ChildRotation.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540GroupLinePosSize.docx
b/sw/qa/writerfilter/dmapper/data/tdf141540GroupLinePosSize.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540GroupLinePosSize.docx
rename to sw/qa/writerfilter/dmapper/data/tdf141540GroupLinePosSize.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540GroupRotation.docx
b/sw/qa/writerfilter/dmapper/data/tdf141540GroupRotation.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf141540GroupRotation.docx
rename to sw/qa/writerfilter/dmapper/data/tdf141540GroupRotation.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142304GroupPosition.docx
b/sw/qa/writerfilter/dmapper/data/tdf142304GroupPosition.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf142304GroupPosition.docx
rename to sw/qa/writerfilter/dmapper/data/tdf142304GroupPosition.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142305SquareWrapMargin.docx
b/sw/qa/writerfilter/dmapper/data/tdf142305SquareWrapMargin.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf142305SquareWrapMargin.docx
rename to sw/qa/writerfilter/dmapper/data/tdf142305SquareWrapMargin.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf142305StrokeGlowMargin.docx
b/sw/qa/writerfilter/dmapper/data/tdf142305StrokeGlowMargin.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf142305StrokeGlowMargin.docx
rename to sw/qa/writerfilter/dmapper/data/tdf142305StrokeGlowMargin.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf143208_wrapTight.docx
b/sw/qa/writerfilter/dmapper/data/tdf143208_wrapTight.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf143208_wrapTight.docx
rename to sw/qa/writerfilter/dmapper/data/tdf143208_wrapTight.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf143455_SmartArtPosition.docx
b/sw/qa/writerfilter/dmapper/data/tdf143455_SmartArtPosition.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf143455_SmartArtPosition.docx
rename to sw/qa/writerfilter/dmapper/data/tdf143455_SmartArtPosition.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf149840_SmartArtBackground.docx
b/sw/qa/writerfilter/dmapper/data/tdf149840_SmartArtBackground.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf149840_SmartArtBackground.docx
rename to sw/qa/writerfilter/dmapper/data/tdf149840_SmartArtBackground.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf152884_Char_Transparency.docx
b/sw/qa/writerfilter/dmapper/data/tdf152884_Char_Transparency.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/tdf152884_Char_Transparency.docx
rename to sw/qa/writerfilter/dmapper/data/tdf152884_Char_Transparency.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/tdf158360.docx
b/sw/qa/writerfilter/dmapper/data/tdf158360.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/tdf158360.docx
rename to sw/qa/writerfilter/dmapper/data/tdf158360.docx
diff --git
a/sw/qa/writerfilter/cppunittests/dmapper/data/textbox-textline-top.docx
b/sw/qa/writerfilter/dmapper/data/textbox-textline-top.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/dmapper/data/textbox-textline-top.docx
rename to sw/qa/writerfilter/dmapper/data/textbox-textline-top.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/textbox-textline.docx
b/sw/qa/writerfilter/dmapper/data/textbox-textline.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/textbox-textline.docx
rename to sw/qa/writerfilter/dmapper/data/textbox-textline.docx
diff --git a/sw/qa/writerfilter/cppunittests/dmapper/data/wrap-poly-crop.docx
b/sw/qa/writerfilter/dmapper/data/wrap-poly-crop.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/dmapper/data/wrap-poly-crop.docx
rename to sw/qa/writerfilter/dmapper/data/wrap-poly-crop.docx
diff --git a/sw/qa/writerfilter/cppunittests/filter/WriterFilter.cxx
b/sw/qa/writerfilter/filter/WriterFilter.cxx
similarity index 97%
rename from sw/qa/writerfilter/cppunittests/filter/WriterFilter.cxx
rename to sw/qa/writerfilter/filter/WriterFilter.cxx
index e084f0fa52ee..5a27887dc332 100644
--- a/sw/qa/writerfilter/cppunittests/filter/WriterFilter.cxx
+++ b/sw/qa/writerfilter/filter/WriterFilter.cxx
@@ -24,7 +24,7 @@ class Test : public UnoApiXmlTest
{
public:
Test()
- : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/filter/data/")
+ : UnoApiXmlTest("/sw/qa/writerfilter/filter/data/")
{
}
};
diff --git
a/sw/qa/writerfilter/cppunittests/filter/data/draw-obj-rtl-no-mirror.docx
b/sw/qa/writerfilter/filter/data/draw-obj-rtl-no-mirror.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filter/data/draw-obj-rtl-no-mirror.docx
rename to sw/qa/writerfilter/filter/data/draw-obj-rtl-no-mirror.docx
diff --git
a/sw/qa/writerfilter/cppunittests/filter/data/inline-endnote-and-footnote.docx
b/sw/qa/writerfilter/filter/data/inline-endnote-and-footnote.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filter/data/inline-endnote-and-footnote.docx
rename to sw/qa/writerfilter/filter/data/inline-endnote-and-footnote.docx
diff --git a/sw/qa/writerfilter/cppunittests/filters-test/README
b/sw/qa/writerfilter/filters-test/README
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/filters-test/README
rename to sw/qa/writerfilter/filters-test/README
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf
b/sw/qa/writerfilter/filters-test/data/fail/CVE-2005-2971-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/CVE-2005-2971-1.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/CVE-2005-2971-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf
b/sw/qa/writerfilter/filters-test/data/fail/CVE-2010-3451-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/CVE-2010-3451-1.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/CVE-2010-3451-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
b/sw/qa/writerfilter/filters-test/data/fail/EDB-18749-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/EDB-18749-1.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/EDB-18749-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf
b/sw/qa/writerfilter/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/LIBREOFFICE-N4LA0OHZ.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/destinationtest-1.rtf
b/sw/qa/writerfilter/filters-test/data/fail/destinationtest-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/destinationtest-1.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/destinationtest-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/destinationtest-2.rtf
b/sw/qa/writerfilter/filters-test/data/fail/destinationtest-2.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/destinationtest-2.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/destinationtest-2.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
b/sw/qa/writerfilter/filters-test/data/fail/nopropertyset-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/nopropertyset-1.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/nopropertyset-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/popstate-1.rtf
b/sw/qa/writerfilter/filters-test/data/fail/popstate-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/popstate-1.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/popstate-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/popstate-2.rtf
b/sw/qa/writerfilter/filters-test/data/fail/popstate-2.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/popstate-2.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/popstate-2.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/propheight-1.rtf
b/sw/qa/writerfilter/filters-test/data/fail/propheight-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/propheight-1.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/propheight-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
b/sw/qa/writerfilter/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
rename to
sw/qa/writerfilter/filters-test/data/fail/sf_edeb1eb341ad4c8608af9396952724a0-128299-minimized.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-5.rtf
b/sw/qa/writerfilter/filters-test/data/fail/tablemanager-5.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-5.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/tablemanager-5.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-6.rtf
b/sw/qa/writerfilter/filters-test/data/fail/tablemanager-6.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-6.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/tablemanager-6.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-7.rtf
b/sw/qa/writerfilter/filters-test/data/fail/tablemanager-7.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/tablemanager-7.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/tablemanager-7.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-1.rtf
b/sw/qa/writerfilter/filters-test/data/fail/topcontext-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-1.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/topcontext-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-2.rtf
b/sw/qa/writerfilter/filters-test/data/fail/topcontext-2.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-2.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/topcontext-2.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-3.rtf
b/sw/qa/writerfilter/filters-test/data/fail/topcontext-3.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/fail/topcontext-3.rtf
rename to sw/qa/writerfilter/filters-test/data/fail/topcontext-3.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/indeterminate/.gitignore
b/sw/qa/writerfilter/filters-test/data/indeterminate/.gitignore
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/indeterminate/.gitignore
rename to sw/qa/writerfilter/filters-test/data/indeterminate/.gitignore
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-2005-2964-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2964-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-2005-2964-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-2005-2972-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2972-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-2005-2972-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-2005-2972-2.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2005-2972-2.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-2005-2972-2.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-2007-0245-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2007-0245-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-2007-0245-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-2010-3333-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2010-3333-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-2010-3333-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-2010-3452-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2010-3452-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-2010-3452-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-2014-1761-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2014-1761-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-2014-1761-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-2014-1761-2.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-2014-1761-2.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-2014-1761-2.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/CVE-pseudo-2009-0238-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/EDB-18754-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/EDB-18754-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/EDB-18754-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/EDB-18940-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/EDB-18940-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/EDB-18940-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
b/sw/qa/writerfilter/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
rename to
sw/qa/writerfilter/filters-test/data/pass/TCI-TN65GP-DDRHDLL-partial.rtf
diff --git a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/abi3623.rtf
b/sw/qa/writerfilter/filters-test/data/pass/abi3623.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/filters-test/data/pass/abi3623.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/abi3623.rtf
diff --git a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/abi4817.rtf
b/sw/qa/writerfilter/filters-test/data/pass/abi4817.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/filters-test/data/pass/abi4817.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/abi4817.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/fdo49666.rtf
b/sw/qa/writerfilter/filters-test/data/pass/fdo49666.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/filters-test/data/pass/fdo49666.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/fdo49666.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/fdo64656.rtf
b/sw/qa/writerfilter/filters-test/data/pass/fdo64656.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/filters-test/data/pass/fdo64656.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/fdo64656.rtf
diff --git a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/i74153.rtf
b/sw/qa/writerfilter/filters-test/data/pass/i74153.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/filters-test/data/pass/i74153.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/i74153.rtf
diff --git a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/i84172.rtf
b/sw/qa/writerfilter/filters-test/data/pass/i84172.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/filters-test/data/pass/i84172.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/i84172.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/parser-state-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/parser-state-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/parser-state-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/parser-state-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/rhbz960019.rtf
b/sw/qa/writerfilter/filters-test/data/pass/rhbz960019.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/rhbz960019.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/rhbz960019.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
b/sw/qa/writerfilter/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
rename to
sw/qa/writerfilter/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-101375-minimized.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
b/sw/qa/writerfilter/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
rename to
sw/qa/writerfilter/filters-test/data/pass/sf_2063317381c4a46d642c79a4b1817dc0-108116-minimized.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
b/sw/qa/writerfilter/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
rename to
sw/qa/writerfilter/filters-test/data/pass/sf_edeb1eb341ad4c8608af9396952724a0-41170.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/tablemanager-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/tablemanager-1.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-2.rtf
b/sw/qa/writerfilter/filters-test/data/pass/tablemanager-2.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-2.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/tablemanager-2.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-3.rtf
b/sw/qa/writerfilter/filters-test/data/pass/tablemanager-3.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-3.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/tablemanager-3.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-4.rtf
b/sw/qa/writerfilter/filters-test/data/pass/tablemanager-4.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/tablemanager-4.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/tablemanager-4.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/filters-test/data/pass/valuelist-1.rtf
b/sw/qa/writerfilter/filters-test/data/pass/valuelist-1.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/filters-test/data/pass/valuelist-1.rtf
rename to sw/qa/writerfilter/filters-test/data/pass/valuelist-1.rtf
diff --git a/sw/qa/writerfilter/cppunittests/filters-test/filters-test.cxx
b/sw/qa/writerfilter/filters-test/filters-test.cxx
similarity index 94%
rename from sw/qa/writerfilter/cppunittests/filters-test/filters-test.cxx
rename to sw/qa/writerfilter/filters-test/filters-test.cxx
index 7ce932bfb8af..918fd73718c0 100644
--- a/sw/qa/writerfilter/cppunittests/filters-test/filters-test.cxx
+++ b/sw/qa/writerfilter/filters-test/filters-test.cxx
@@ -69,8 +69,7 @@ bool RtfTest::load(const OUString&, const OUString& rURL,
const OUString&, SfxFi
CPPUNIT_TEST_FIXTURE(RtfTest, testFilter)
{
#ifndef DISABLE_CVE_TESTS
- testDir(OUString(),
-
m_directories.getURLFromSrc(u"/sw/qa/writerfilter/cppunittests/filters-test/data/"));
+ testDir(OUString(),
m_directories.getURLFromSrc(u"/sw/qa/writerfilter/filters-test/data/"));
#endif
}
diff --git a/sw/qa/writerfilter/cppunittests/misc/misc.cxx
b/sw/qa/writerfilter/misc/misc.cxx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/misc/misc.cxx
rename to sw/qa/writerfilter/misc/misc.cxx
diff --git a/sw/qa/writerfilter/cppunittests/ooxml/data/floattable-leak.docx
b/sw/qa/writerfilter/ooxml/data/floattable-leak.docx
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/ooxml/data/floattable-leak.docx
rename to sw/qa/writerfilter/ooxml/data/floattable-leak.docx
diff --git
a/sw/qa/writerfilter/cppunittests/ooxml/data/floattable-tables-lost.docx
b/sw/qa/writerfilter/ooxml/data/floattable-tables-lost.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/ooxml/data/floattable-tables-lost.docx
rename to sw/qa/writerfilter/ooxml/data/floattable-tables-lost.docx
diff --git
a/sw/qa/writerfilter/cppunittests/ooxml/data/recursive_header_rels.docx
b/sw/qa/writerfilter/ooxml/data/recursive_header_rels.docx
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/ooxml/data/recursive_header_rels.docx
rename to sw/qa/writerfilter/ooxml/data/recursive_header_rels.docx
diff --git a/sw/qa/writerfilter/cppunittests/ooxml/ooxml.cxx
b/sw/qa/writerfilter/ooxml/ooxml.cxx
similarity index 97%
rename from sw/qa/writerfilter/cppunittests/ooxml/ooxml.cxx
rename to sw/qa/writerfilter/ooxml/ooxml.cxx
index 5cbd9e219449..1911c5666450 100644
--- a/sw/qa/writerfilter/cppunittests/ooxml/ooxml.cxx
+++ b/sw/qa/writerfilter/ooxml/ooxml.cxx
@@ -21,7 +21,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/ooxml/data/")
+ : UnoApiTest("/sw/qa/writerfilter/ooxml/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/center-after-page.rtf
b/sw/qa/writerfilter/rtftok/data/center-after-page.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/center-after-page.rtf
rename to sw/qa/writerfilter/rtftok/data/center-after-page.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/char-hidden-intbl.rtf
b/sw/qa/writerfilter/rtftok/data/char-hidden-intbl.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/char-hidden-intbl.rtf
rename to sw/qa/writerfilter/rtftok/data/char-hidden-intbl.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf
b/sw/qa/writerfilter/rtftok/data/do-not-break-wrapped-tables.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/rtftok/data/do-not-break-wrapped-tables.rtf
rename to sw/qa/writerfilter/rtftok/data/do-not-break-wrapped-tables.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/duplicated-image.rtf
b/sw/qa/writerfilter/rtftok/data/duplicated-image.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/duplicated-image.rtf
rename to sw/qa/writerfilter/rtftok/data/duplicated-image.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/floating-table.rtf
b/sw/qa/writerfilter/rtftok/data/floating-table.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/floating-table.rtf
rename to sw/qa/writerfilter/rtftok/data/floating-table.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/rtftok/data/floattable-tbl-overlap.rtf
b/sw/qa/writerfilter/rtftok/data/floattable-tbl-overlap.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/rtftok/data/floattable-tbl-overlap.rtf
rename to sw/qa/writerfilter/rtftok/data/floattable-tbl-overlap.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/rtftok/data/floattable-then-sect-break.rtf
b/sw/qa/writerfilter/rtftok/data/floattable-then-sect-break.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/rtftok/data/floattable-then-sect-break.rtf
rename to sw/qa/writerfilter/rtftok/data/floattable-then-sect-break.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/follow-style.rtf
b/sw/qa/writerfilter/rtftok/data/follow-style.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/follow-style.rtf
rename to sw/qa/writerfilter/rtftok/data/follow-style.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/invalid-hex.rtf
b/sw/qa/writerfilter/rtftok/data/invalid-hex.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/invalid-hex.rtf
rename to sw/qa/writerfilter/rtftok/data/invalid-hex.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/left-margin-dedup.rtf
b/sw/qa/writerfilter/rtftok/data/left-margin-dedup.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/left-margin-dedup.rtf
rename to sw/qa/writerfilter/rtftok/data/left-margin-dedup.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/rtftok/data/negative-page-border.rtf
b/sw/qa/writerfilter/rtftok/data/negative-page-border.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/negative-page-border.rtf
rename to sw/qa/writerfilter/rtftok/data/negative-page-border.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/rtftok/data/old-para-num-left-margin.rtf
b/sw/qa/writerfilter/rtftok/data/old-para-num-left-margin.rtf
similarity index 100%
rename from
sw/qa/writerfilter/cppunittests/rtftok/data/old-para-num-left-margin.rtf
rename to sw/qa/writerfilter/rtftok/data/old-para-num-left-margin.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/page.rtf
b/sw/qa/writerfilter/rtftok/data/page.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/page.rtf
rename to sw/qa/writerfilter/rtftok/data/page.rtf
diff --git
a/sw/qa/writerfilter/cppunittests/rtftok/data/picture-in-textframe.rtf
b/sw/qa/writerfilter/rtftok/data/picture-in-textframe.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/picture-in-textframe.rtf
rename to sw/qa/writerfilter/rtftok/data/picture-in-textframe.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/picw-pich.rtf
b/sw/qa/writerfilter/rtftok/data/picw-pich.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/picw-pich.rtf
rename to sw/qa/writerfilter/rtftok/data/picw-pich.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/data/watermark.rtf
b/sw/qa/writerfilter/rtftok/data/watermark.rtf
similarity index 100%
rename from sw/qa/writerfilter/cppunittests/rtftok/data/watermark.rtf
rename to sw/qa/writerfilter/rtftok/data/watermark.rtf
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchflag.cxx
b/sw/qa/writerfilter/rtftok/rtfdispatchflag.cxx
similarity index 98%
rename from sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchflag.cxx
rename to sw/qa/writerfilter/rtftok/rtfdispatchflag.cxx
index e3a993bdf6f4..8c660435a3a6 100644
--- a/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchflag.cxx
+++ b/sw/qa/writerfilter/rtftok/rtfdispatchflag.cxx
@@ -23,7 +23,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("sw/qa//writerfilter/cppunittests/rtftok/data/")
+ : UnoApiTest("sw/qa//writerfilter/rtftok/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchsymbol.cxx
b/sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx
similarity index 97%
rename from sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchsymbol.cxx
rename to sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx
index c2adb308611d..64a7a35ec327 100644
--- a/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchsymbol.cxx
+++ b/sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx
@@ -23,7 +23,7 @@ class Test : public UnoApiXmlTest
{
public:
Test()
- : UnoApiXmlTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
+ : UnoApiXmlTest("/sw/qa/writerfilter/rtftok/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchvalue.cxx
b/sw/qa/writerfilter/rtftok/rtfdispatchvalue.cxx
similarity index 97%
rename from sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchvalue.cxx
rename to sw/qa/writerfilter/rtftok/rtfdispatchvalue.cxx
index 8d8de947b86e..c2d0b06fbe45 100644
--- a/sw/qa/writerfilter/cppunittests/rtftok/rtfdispatchvalue.cxx
+++ b/sw/qa/writerfilter/rtftok/rtfdispatchvalue.cxx
@@ -22,7 +22,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
+ : UnoApiTest("/sw/qa/writerfilter/rtftok/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/rtfdocumentimpl.cxx
b/sw/qa/writerfilter/rtftok/rtfdocumentimpl.cxx
similarity index 98%
rename from sw/qa/writerfilter/cppunittests/rtftok/rtfdocumentimpl.cxx
rename to sw/qa/writerfilter/rtftok/rtfdocumentimpl.cxx
index 6b42db055c3a..9ec85990c21d 100644
--- a/sw/qa/writerfilter/cppunittests/rtftok/rtfdocumentimpl.cxx
+++ b/sw/qa/writerfilter/rtftok/rtfdocumentimpl.cxx
@@ -27,7 +27,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
+ : UnoApiTest("/sw/qa/writerfilter/rtftok/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/rtfsdrimport.cxx
b/sw/qa/writerfilter/rtftok/rtfsdrimport.cxx
similarity index 97%
rename from sw/qa/writerfilter/cppunittests/rtftok/rtfsdrimport.cxx
rename to sw/qa/writerfilter/rtftok/rtfsdrimport.cxx
index a6e3da91c754..f9afa22c3202 100644
--- a/sw/qa/writerfilter/cppunittests/rtftok/rtfsdrimport.cxx
+++ b/sw/qa/writerfilter/rtftok/rtfsdrimport.cxx
@@ -23,7 +23,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
+ : UnoApiTest("/sw/qa/writerfilter/rtftok/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/rtfsprm.cxx
b/sw/qa/writerfilter/rtftok/rtfsprm.cxx
similarity index 97%
rename from sw/qa/writerfilter/cppunittests/rtftok/rtfsprm.cxx
rename to sw/qa/writerfilter/rtftok/rtfsprm.cxx
index a736936b54c6..b187ada6e893 100644
--- a/sw/qa/writerfilter/cppunittests/rtftok/rtfsprm.cxx
+++ b/sw/qa/writerfilter/rtftok/rtfsprm.cxx
@@ -22,7 +22,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
+ : UnoApiTest("/sw/qa/writerfilter/rtftok/data/")
{
}
};
diff --git a/sw/qa/writerfilter/cppunittests/rtftok/rtftokenizer.cxx
b/sw/qa/writerfilter/rtftok/rtftokenizer.cxx
similarity index 93%
rename from sw/qa/writerfilter/cppunittests/rtftok/rtftokenizer.cxx
rename to sw/qa/writerfilter/rtftok/rtftokenizer.cxx
index 16a32a82db6a..a2315fb78d17 100644
--- a/sw/qa/writerfilter/cppunittests/rtftok/rtftokenizer.cxx
+++ b/sw/qa/writerfilter/rtftok/rtftokenizer.cxx
@@ -20,7 +20,7 @@ class Test : public UnoApiTest
{
public:
Test()
- : UnoApiTest("/sw/qa/writerfilter/cppunittests/rtftok/data/")
+ : UnoApiTest("/sw/qa/writerfilter/rtftok/data/")
{
}
};
