diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 306337889cc9..74d6ab2face0 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -18,4 +18,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_ww8export, \
     svt \
 ))
 
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_ww8export,abort))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/ww8export/data/cell-bg-color.odt b/sw/qa/extras/ww8export/data/cell-bg-color.odt
index 3565f40c210e..0a6a3076e5f5 100644
Binary files a/sw/qa/extras/ww8export/data/cell-bg-color.odt and b/sw/qa/extras/ww8export/data/cell-bg-color.odt differ
diff --git a/sw/qa/extras/ww8export/data/cjklist30.doc b/sw/qa/extras/ww8export/data/cjklist30.doc
index 48f22cf79a35..bdabe3561404 100644
Binary files a/sw/qa/extras/ww8export/data/cjklist30.doc and b/sw/qa/extras/ww8export/data/cjklist30.doc differ
diff --git a/sw/qa/extras/ww8export/data/cjklist31.doc b/sw/qa/extras/ww8export/data/cjklist31.doc
index 4a7d3e7e1360..d11c90a8be67 100644
Binary files a/sw/qa/extras/ww8export/data/cjklist31.doc and b/sw/qa/extras/ww8export/data/cjklist31.doc differ
diff --git a/sw/qa/extras/ww8export/data/cjklist34.doc b/sw/qa/extras/ww8export/data/cjklist34.doc
index 551fc89527c9..8a4620a0194a 100644
Binary files a/sw/qa/extras/ww8export/data/cjklist34.doc and b/sw/qa/extras/ww8export/data/cjklist34.doc differ
diff --git a/sw/qa/extras/ww8export/data/cjklist35.doc b/sw/qa/extras/ww8export/data/cjklist35.doc
index 33d247029ad9..8810acb09423 100644
Binary files a/sw/qa/extras/ww8export/data/cjklist35.doc and b/sw/qa/extras/ww8export/data/cjklist35.doc differ
diff --git a/sw/qa/extras/ww8export/data/fdo68967.doc b/sw/qa/extras/ww8export/data/fdo68967.doc
index 05271c3d868a..a14ecc8732e6 100644
Binary files a/sw/qa/extras/ww8export/data/fdo68967.doc and b/sw/qa/extras/ww8export/data/fdo68967.doc differ
diff --git a/sw/qa/extras/ww8export/data/i120158.doc b/sw/qa/extras/ww8export/data/i120158.doc
index 6adf3ec13d52..eef3154d81f2 100644
Binary files a/sw/qa/extras/ww8export/data/i120158.doc and b/sw/qa/extras/ww8export/data/i120158.doc differ
diff --git a/sw/qa/extras/ww8export/data/n760294.doc b/sw/qa/extras/ww8export/data/n760294.doc
index 04960d060b15..bfbe682e1290 100644
Binary files a/sw/qa/extras/ww8export/data/n760294.doc and b/sw/qa/extras/ww8export/data/n760294.doc differ
diff --git a/sw/qa/extras/ww8export/data/new-page-styles.doc b/sw/qa/extras/ww8export/data/new-page-styles.doc
index c3886fd6bf2d..6e1cf5cbd67a 100644
Binary files a/sw/qa/extras/ww8export/data/new-page-styles.doc and b/sw/qa/extras/ww8export/data/new-page-styles.doc differ
diff --git a/sw/qa/extras/ww8export/data/ooo92948-1.doc b/sw/qa/extras/ww8export/data/ooo92948-1.doc
index f355eaa26794..96eee00ac5e6 100644
Binary files a/sw/qa/extras/ww8export/data/ooo92948-1.doc and b/sw/qa/extras/ww8export/data/ooo92948-1.doc differ
diff --git a/sw/qa/extras/ww8export/data/redline-export-1.odt b/sw/qa/extras/ww8export/data/redline-export-1.odt
index 31aacce47284..a966dcf18024 100644
Binary files a/sw/qa/extras/ww8export/data/redline-export-1.odt and b/sw/qa/extras/ww8export/data/redline-export-1.odt differ
diff --git a/sw/qa/extras/ww8export/data/redline-export-2.odt b/sw/qa/extras/ww8export/data/redline-export-2.odt
index 2aca5eee4cd3..2d9a6167d24e 100644
Binary files a/sw/qa/extras/ww8export/data/redline-export-2.odt and b/sw/qa/extras/ww8export/data/redline-export-2.odt differ
diff --git a/sw/qa/extras/ww8export/data/redline-export-3.odt b/sw/qa/extras/ww8export/data/redline-export-3.odt
index 6d0d80a08090..f1b2ecd76270 100644
Binary files a/sw/qa/extras/ww8export/data/redline-export-3.odt and b/sw/qa/extras/ww8export/data/redline-export-3.odt differ
diff --git a/sw/qa/extras/ww8export/data/tdf118564.doc b/sw/qa/extras/ww8export/data/tdf118564.doc
index 4040e05e27bf..a8c53d24796e 100644
Binary files a/sw/qa/extras/ww8export/data/tdf118564.doc and b/sw/qa/extras/ww8export/data/tdf118564.doc differ
diff --git a/sw/qa/extras/ww8export/data/tdf130262.doc b/sw/qa/extras/ww8export/data/tdf130262.doc
index fb60beacd79d..f652cca8f9fd 100644
Binary files a/sw/qa/extras/ww8export/data/tdf130262.doc and b/sw/qa/extras/ww8export/data/tdf130262.doc differ
diff --git a/sw/qa/extras/ww8export/data/tdf46441-2.odt b/sw/qa/extras/ww8export/data/tdf46441-2.odt
index ed73406c5ab7..d9e8ea03e66a 100644
Binary files a/sw/qa/extras/ww8export/data/tdf46441-2.odt and b/sw/qa/extras/ww8export/data/tdf46441-2.odt differ
diff --git a/sw/qa/extras/ww8export/data/tdf59896.doc b/sw/qa/extras/ww8export/data/tdf59896.doc
index a3c7242992f0..bdf45712988b 100644
Binary files a/sw/qa/extras/ww8export/data/tdf59896.doc and b/sw/qa/extras/ww8export/data/tdf59896.doc differ
diff --git a/sw/qa/extras/ww8export/data/tdf95576.doc b/sw/qa/extras/ww8export/data/tdf95576.doc
index a8a601885f33..348ebd71a2f6 100644
Binary files a/sw/qa/extras/ww8export/data/tdf95576.doc and b/sw/qa/extras/ww8export/data/tdf95576.doc differ