sw/CppunitTest_sw_ww8export.mk | 4 ++++
sw/qa/extras/ww8export/data/cell-bg-color.odt |binary
sw/qa/extras/ww8export/data/cjklist30.doc |binary
sw/qa/extras/ww8export/data/cjklist31.doc |binary
sw/qa/extras/ww8export/data/cjklist34.doc |binary
sw/qa/extras/ww8export/data/cjklist35.doc |binary
sw/qa/extras/ww8export/data/fdo68967.doc |binary
sw/qa/extras/ww8export/data/i120158.doc |binary
sw/qa/extras/ww8export/data/n760294.doc |binary
sw/qa/extras/ww8export/data/new-page-styles.doc |binary
sw/qa/extras/ww8export/data/ooo92948-1.doc |binary
sw/qa/extras/ww8export/data/redline-export-1.odt |binary
sw/qa/extras/ww8export/data/redline-export-2.odt |binary
sw/qa/extras/ww8export/data/redline-export-3.odt |binary
sw/qa/extras/ww8export/data/tdf118564.doc |binary
sw/qa/extras/ww8export/data/tdf130262.doc |binary
sw/qa/extras/ww8export/data/tdf46441-2.odt |binary
sw/qa/extras/ww8export/data/tdf59896.doc |binary
sw/qa/extras/ww8export/data/tdf95576.doc |binary
19 files changed, 4 insertions(+)
New commits:
commit c5b71a7f6c9673074871ad84df655faeb6a036eb
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Wed Dec 13 19:57:38 2023 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Dec 14 08:20:25 2023 +0100
CppunitTest_sw_ww8export: avoid external fonts
- sw/qa/extras/ww8export/data/cell-bg-color.odt:
- missing font: 'Helvetica' try: Liberation Sans instead
- sw/qa/extras/ww8export/data/tdf46441-2.odt:
- missing font: 'Times Regular' try: Noto Sans instead
- sw/qa/extras/ww8export/data/ooo92948-1.doc:
- missing font: 'Baskerville MT' try: Noto Sans instead
- missing font: 'Futura Book' try: Noto Sans instead
- sw/qa/extras/ww8export/data/i120158.doc:
- missing font: 'SimSun' try: Noto Serif instead
- sw/qa/extras/ww8export/data/fdo68967.doc:
- missing font: 'Arial Rounded MT Bold' try: Noto Sans instead
- sw/qa/extras/ww8export/data/n760294.doc:
- missing font: 'Thorndale AMT' try: Liberation Serif instead
- sw/qa/extras/ww8export/data/new-page-styles.doc:
- missing font: 'Raytheon Corporate Logo' try: Noto Sans instead
- sw/qa/extras/ww8export/data/redline-export-1.odt:
- missing font: 'Helvetica' try: Liberation Sans instead
- sw/qa/extras/ww8export/data/redline-export-2.odt:
- missing font: 'Helvetica' try: Liberation Sans instead
- sw/qa/extras/ww8export/data/redline-export-3.odt:
- missing font: 'Helvetica' try: Liberation Sans instead
- sw/qa/extras/ww8export/data/tdf118564.doc:
- missing font: 'FangSong_GB2312' try: Noto Sans instead
- missing font: 'SimSun' try: Noto Serif instead
- missing font: 'FangSong' try: Noto Sans instead
- sw/qa/extras/ww8export/data/tdf130262.doc:
- missing font: 'Univers' try: Noto Sans instead
- sw/qa/extras/ww8export/data/tdf59896.doc (WW6):
- missing font: 'MS Sans Serif' try: DejaVu Sans instead
- sw/qa/extras/ww8export/data/tdf95576.doc:
- missing font: 'Calibri Light' try: Noto Sans instead
- sw/qa/extras/ww8export/data/cjklist30.doc:
- missing font: '新細明體' try: Noto Sans instead
- missing font: 'PMingLiU' try: Noto Sans instead
- sw/qa/extras/ww8export/data/cjklist31.doc:
- missing font: '新細明體' try: Noto Sans instead
- missing font: 'PMingLiU' try: Noto Sans instead
- sw/qa/extras/ww8export/data/cjklist34.doc:
- missing font: '新細明體' try: Noto Sans instead
- missing font: 'PMingLiU' try: Noto Sans instead
- sw/qa/extras/ww8export/data/cjklist35.doc:
- missing font: '新細明體' try: Noto Sans instead
- missing font: 'PMingLiU' try: Noto Sans instead
The .doc files are edited with Word (convert to DOCX, edit there,
convert back), the single WW6 file is binary patched, using spaces as
padding for the shorter new font name.
Change-Id: Ic023a0ba6e542ac0f3782dfef5986bdcf69f3056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160713
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
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
