sw/CppunitTest_sw_ooxmlimport2.mk | 2 + sw/CppunitTest_sw_tiledrendering.mk | 4 ++ sw/qa/extras/tiledrendering/data/removenode_redline_callback.fodt | 16 +++++----- sw/qa/extras/tiledrendering/data/splitnode_redline_callback.fodt | 14 ++++---- sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt |binary 5 files changed, 21 insertions(+), 15 deletions(-)
New commits: commit 07beedb9408972aceee0a48b94ae83fe525fef76 Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 6 11:22:07 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jan 6 20:14:53 2026 +0100 CppunitTest_sw_ooxmlimport2 wants to use more fonts Change-Id: If618fff8367b3b63da4c00f4c6135617ca75ed1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196610 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk b/sw/CppunitTest_sw_ooxmlimport2.mk index d201424ef1ab..39be13e05bee 100644 --- a/sw/CppunitTest_sw_ooxmlimport2.mk +++ b/sw/CppunitTest_sw_ooxmlimport2.mk @@ -77,6 +77,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_ooxmlimport2,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport2)) +$(eval $(call gb_CppunitTest_use_more_fonts,sw_ooxmlimport2)) + $(eval $(call gb_CppunitTest_add_arguments,sw_ooxmlimport2, \ -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ )) commit 7adac22ce027f84983aab0ca8e34f6d9a3455fad Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 6 11:05:41 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jan 6 20:14:41 2026 +0100 CppunitTest_sw_tiledrendering: gb_CppunitTest_set_non_application_font_use which required changing the font that a few unit test documents use Change-Id: Iaeba92de868d2f92513b11fc57efa309a74c98bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196599 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/CppunitTest_sw_tiledrendering.mk b/sw/CppunitTest_sw_tiledrendering.mk index 830167ca21d3..58dccbce0ccf 100644 --- a/sw/CppunitTest_sw_tiledrendering.mk +++ b/sw/CppunitTest_sw_tiledrendering.mk @@ -64,4 +64,8 @@ $(eval $(call gb_CppunitTest_use_rdb,sw_tiledrendering,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_tiledrendering)) +ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) +$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_tiledrendering,abort)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sw/qa/extras/tiledrendering/data/removenode_redline_callback.fodt b/sw/qa/extras/tiledrendering/data/removenode_redline_callback.fodt index ed06348cc423..d42ed2fc1b07 100644 --- a/sw/qa/extras/tiledrendering/data/removenode_redline_callback.fodt +++ b/sw/qa/extras/tiledrendering/data/removenode_redline_callback.fodt @@ -126,7 +126,7 @@ <style:font-face style:name="FreeSans1" svg:font-family="FreeSans" style:font-family-generic="swiss"/> <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'" style:font-family-generic="roman" style:font-pitch="variable"/> <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> - <style:font-face style:name="Open Sans" svg:font-family="'Open Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> + <style:font-face style:name="Noto Sans" svg:font-family="'Noto Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> <style:font-face style:name="Droid Sans" svg:font-family="'Droid Sans'" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="FreeSans" svg:font-family="FreeSans" style:font-family-generic="system" style:font-pitch="variable"/> </office:font-face-decls> @@ -225,22 +225,22 @@ </office:styles> <office:automatic-styles> <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="0000614b" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="0000614b" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="00054216" officeooo:paragraph-rsid="00054216" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="00054216" officeooo:paragraph-rsid="00054216" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="001b47cb" officeooo:paragraph-rsid="001b47cb" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="001b47cb" officeooo:paragraph-rsid="001b47cb" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="001b47cb" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="001b47cb" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="00054216" officeooo:paragraph-rsid="00054216" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="00054216" officeooo:paragraph-rsid="00054216" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="0000614b" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="0000614b" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:page-layout style:name="pm1"> <style:page-layout-properties fo:page-width="8.2681in" fo:page-height="11.6929in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.278in" style:layout-grid-ruby-height="0.139in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0in"> @@ -303,4 +303,4 @@ <text:p text:style-name="P2"/> </office:text> </office:body> -</office:document> \ No newline at end of file +</office:document> diff --git a/sw/qa/extras/tiledrendering/data/splitnode_redline_callback.fodt b/sw/qa/extras/tiledrendering/data/splitnode_redline_callback.fodt index bffc3a42c9dd..15cf52d0dfd7 100644 --- a/sw/qa/extras/tiledrendering/data/splitnode_redline_callback.fodt +++ b/sw/qa/extras/tiledrendering/data/splitnode_redline_callback.fodt @@ -126,7 +126,7 @@ <style:font-face style:name="FreeSans1" svg:font-family="FreeSans" style:font-family-generic="swiss"/> <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'" style:font-family-generic="roman" style:font-pitch="variable"/> <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> - <style:font-face style:name="Open Sans" svg:font-family="'Open Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> + <style:font-face style:name="Noto Sans" svg:font-family="'Noto Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> <style:font-face style:name="Droid Sans" svg:font-family="'Droid Sans'" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="FreeSans" svg:font-family="FreeSans" style:font-family-generic="system" style:font-pitch="variable"/> </office:font-face-decls> @@ -225,19 +225,19 @@ </office:styles> <office:automatic-styles> <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="0000614b" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="0000614b" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="00054216" officeooo:paragraph-rsid="00054216" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="00054216" officeooo:paragraph-rsid="00054216" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="001b47cb" officeooo:paragraph-rsid="001b47cb" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="001b47cb" officeooo:paragraph-rsid="001b47cb" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="001b47cb" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="001b47cb" officeooo:paragraph-rsid="0000614b" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard"> - <style:text-properties style:font-name="Open Sans" fo:font-size="12pt" officeooo:rsid="00054216" officeooo:paragraph-rsid="00054216" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> + <style:text-properties style:font-name="Noto Sans" fo:font-size="12pt" officeooo:rsid="00054216" officeooo:paragraph-rsid="00054216" style:font-size-asian="10.5pt" style:font-size-complex="12pt"/> </style:style> <style:page-layout style:name="pm1"> <style:page-layout-properties fo:page-width="8.2681in" fo:page-height="11.6929in" style:num-format="1" style:print-orientation="portrait" fo:margin-top="0.7874in" fo:margin-bottom="0.7874in" fo:margin-left="0.7874in" fo:margin-right="0.7874in" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20" style:layout-grid-base-height="0.278in" style:layout-grid-ruby-height="0.139in" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0in"> @@ -291,4 +291,4 @@ <text:p text:style-name="P2"/> </office:text> </office:body> -</office:document> \ No newline at end of file +</office:document> diff --git a/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt b/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt index b42c5cc51588..01fcd0710807 100644 Binary files a/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt and b/sw/qa/extras/tiledrendering/data/table-paint-invalidate.odt differ
