bin/replace_missing_fonts.sh | 7 +++++++
sw/CppunitTest_sw_ooxmlexport5.mk | 4 ++++
sw/qa/extras/ooxmlexport/data/fdo77727.docx |binary
sw/qa/extras/ooxmlexport/data/fdo77887.docx |binary
sw/qa/extras/ooxmlexport/data/fdo78420.docx |binary
sw/qa/extras/ooxmlexport/data/fdo79822.docx |binary
sw/qa/extras/ooxmlexport/data/ooo96040-2.odt |binary
7 files changed, 11 insertions(+)
New commits:
commit 8f75226dd99cb02e349abf476eeaeb7b9f6022ae
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Mar 7 18:52:48 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Mar 7 21:03:23 2024 +0100
CppunitTest_sw_ooxmlexport5: turn on set_non_application_font_use
From bin/replace_missing_fonts.sh:
Replacing 'Tahoma' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo77887.docx
Replacing 'Thorndale' with 'Liberation Serif' in
sw/qa/extras/ooxmlexport/data//ooo96040-2.odt
Replacing 'Tahoma' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//ooo96040-2.odt
Replacing 'Albany' with 'Liberation Sans' in
sw/qa/extras/ooxmlexport/data//ooo96040-2.odt
Replacing 'Trebuchet MS' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo77727.docx
Replacing 'Times' with 'Liberation Serif' in
sw/qa/extras/ooxmlexport/data//fdo77727.docx
Replacing 'Tahoma' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo77727.docx
Replacing 'Century Gothic' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo77727.docx
Replacing 'Lucida Sans Unicode' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo77727.docx
Replacing 'Candara' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo77727.docx
Replacing 'Tahoma' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo78420.docx
Replacing 'Verdana' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo78420.docx
Replacing 'Gill Sans MT' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo79822.docx
Replacing 'Tahoma' with 'Noto Sans' in
sw/qa/extras/ooxmlexport/data//fdo79822.docx
Change-Id: I298d9007ae6bd59a8a804902524b59ac524618c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164548
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/bin/replace_missing_fonts.sh b/bin/replace_missing_fonts.sh
index 7c676d30052a..f06e6b7a6c72 100755
--- a/bin/replace_missing_fonts.sh
+++ b/bin/replace_missing_fonts.sh
@@ -24,6 +24,13 @@ replacements["FreeSans"]="Noto Sans"
replacements["DINPro-Medium"]="Noto Sans"
replacements["Open Sans Light"]="Noto Sans"
replacements["Lora - regular"]="Noto Sans"
+replacements["Tahoma"]="Noto Sans"
+replacements["Thorndale"]="Liberation Serif"
+replacements["Albany"]="Liberation Sans"
+replacements["Lucida Sans Unicode"]="Noto Sans"
+replacements["Candara"]="Noto Sans"
+replacements["Verdana"]="Noto Sans"
+replacements["Gill Sans MT"]="Noto Sans"
extracted_folder=".temp_extracted"
diff --git a/sw/CppunitTest_sw_ooxmlexport5.mk
b/sw/CppunitTest_sw_ooxmlexport5.mk
index 71eea4a09b69..cbb21cb34039 100644
--- a/sw/CppunitTest_sw_ooxmlexport5.mk
+++ b/sw/CppunitTest_sw_ooxmlexport5.mk
@@ -16,4 +16,8 @@ $(eval $(call gb_CppunitTest_use_uiconfigs,sw_ooxmlexport5, \
svx \
))
+ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),)
+$(eval $(call
gb_CppunitTest_set_non_application_font_use,sw_ooxmlexport5,abort))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77727.docx
b/sw/qa/extras/ooxmlexport/data/fdo77727.docx
index 9f553e210df6..db172b10bd26 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo77727.docx and
b/sw/qa/extras/ooxmlexport/data/fdo77727.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77887.docx
b/sw/qa/extras/ooxmlexport/data/fdo77887.docx
index cb3f4537dd86..c77ddb6fc07a 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo77887.docx and
b/sw/qa/extras/ooxmlexport/data/fdo77887.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78420.docx
b/sw/qa/extras/ooxmlexport/data/fdo78420.docx
index 6b253b189f5c..b81aa8bae0be 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo78420.docx and
b/sw/qa/extras/ooxmlexport/data/fdo78420.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/fdo79822.docx
b/sw/qa/extras/ooxmlexport/data/fdo79822.docx
index 2844671d607d..ee3966cabc52 100644
Binary files a/sw/qa/extras/ooxmlexport/data/fdo79822.docx and
b/sw/qa/extras/ooxmlexport/data/fdo79822.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt
b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt
index 35a1858e533e..55bc2f1c19d8 100644
Binary files a/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt and
b/sw/qa/extras/ooxmlexport/data/ooo96040-2.odt differ
