sw/CppunitTest_sw_core_theme.mk | 4 ++++ sw/qa/core/theme/ThemeTest.cxx | 2 +- sw/qa/core/theme/data/ThemeColorInHeading.docx |binary sw/qa/core/theme/data/ThemeColorInHeading.fodt | 12 ++++++------ 4 files changed, 11 insertions(+), 7 deletions(-)
New commits: commit e4680f51c7fafa6ce98e60368643f46389230c4a Author: Noel Grandin <[email protected]> AuthorDate: Tue Jan 6 13:41:08 2026 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Jan 6 20:15:47 2026 +0100 CppunitTest_sw_core_theme: gb_CppunitTest_set_non_application_font_use Change-Id: I3e183660601b06713178ad048ee68b679b2e6e2a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196616 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sw/CppunitTest_sw_core_theme.mk b/sw/CppunitTest_sw_core_theme.mk index 5938916bd9df..f520ac510de2 100644 --- a/sw/CppunitTest_sw_core_theme.mk +++ b/sw/CppunitTest_sw_core_theme.mk @@ -61,4 +61,8 @@ $(eval $(call gb_CppunitTest_use_vcl,sw_core_theme)) $(eval $(call gb_CppunitTest_use_rdb,sw_core_theme,services)) $(eval $(call gb_CppunitTest_use_configuration,sw_core_theme)) +ifneq ($(filter MORE_FONTS,$(BUILD_TYPE)),) +$(eval $(call gb_CppunitTest_set_non_application_font_use,sw_core_theme,abort)) +endif + # vim: set noet sw=4 ts=4: diff --git a/sw/qa/core/theme/ThemeTest.cxx b/sw/qa/core/theme/ThemeTest.cxx index 2077b1125d66..12ecc9cd6460 100644 --- a/sw/qa/core/theme/ThemeTest.cxx +++ b/sw/qa/core/theme/ThemeTest.cxx @@ -361,7 +361,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest, testDrawPageThemeExistsDOCX) CPPUNIT_ASSERT_EQUAL(Color(0xCCDDEA), pTheme->GetColor(model::ThemeColorType::Light2)); model::FontScheme const& rFontScheme = pTheme->getFontScheme(); - CPPUNIT_ASSERT_EQUAL(u"Calibri Light"_ustr, rFontScheme.getMajorLatin().maTypeface); + CPPUNIT_ASSERT_EQUAL(u"Noto Sans"_ustr, rFontScheme.getMajorLatin().maTypeface); CPPUNIT_ASSERT_EQUAL(u"Calibri"_ustr, rFontScheme.getMinorLatin().maTypeface); CPPUNIT_ASSERT_EQUAL(true, rFontScheme.getMajorAsian().maTypeface.isEmpty()); CPPUNIT_ASSERT_EQUAL(true, rFontScheme.getMinorAsian().maTypeface.isEmpty()); diff --git a/sw/qa/core/theme/data/ThemeColorInHeading.docx b/sw/qa/core/theme/data/ThemeColorInHeading.docx index e350c2676d41..b35f21b32d51 100644 Binary files a/sw/qa/core/theme/data/ThemeColorInHeading.docx and b/sw/qa/core/theme/data/ThemeColorInHeading.docx differ diff --git a/sw/qa/core/theme/data/ThemeColorInHeading.fodt b/sw/qa/core/theme/data/ThemeColorInHeading.fodt index 943a654623a0..d32f0f152f1c 100644 --- a/sw/qa/core/theme/data/ThemeColorInHeading.fodt +++ b/sw/qa/core/theme/data/ThemeColorInHeading.fodt @@ -151,7 +151,7 @@ </office:scripts> <office:font-face-decls> <style:font-face style:name="Calibri" svg:font-family="Calibri" style:font-family-generic="roman" style:font-pitch="variable"/> - <style:font-face style:name="Calibri Light" svg:font-family="'Calibri Light'" style:font-family-generic="roman" style:font-pitch="variable"/> + <style:font-face style:name="Noto Serif" svg:font-family="'Noto Serif'" style:font-family-generic="roman" style:font-pitch="variable"/> <style:font-face style:name="Calibri1" svg:font-family="Calibri" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="F" svg:font-family="" style:font-family-generic="system" 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"/> @@ -200,7 +200,7 @@ </style:style> <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Standard" loext:linked-style-name="Heading_20_1_20_Char" style:default-outline-level="1" style:list-style-name="" style:class="text"> <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:keep-together="always" fo:keep-with-next="always"/> - <style:text-properties fo:color="#aa610d" loext:opacity="100%" style:font-name="Calibri Light" fo:font-family="'Calibri Light'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="16pt" style:font-name-asian="F" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="16pt" style:font-name-complex="F" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="16pt"> + <style:text-properties fo:color="#aa610d" loext:opacity="100%" style:font-name="Noto Serif" fo:font-family="'Noto Serif'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="16pt" style:font-name-asian="F" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="16pt" style:font-name-complex="F" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="16pt"> <loext:char-complex-color loext:theme-type="accent1"> <loext:transformation loext:type="shade" loext:value="2539"/> </loext:char-complex-color> @@ -208,7 +208,7 @@ </style:style> <style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Standard" loext:linked-style-name="Heading_20_2_20_Char" style:default-outline-level="2" style:list-style-name="" style:class="text"> <style:paragraph-properties fo:margin-top="0.071cm" fo:margin-bottom="0cm" style:contextual-spacing="false" fo:keep-together="always" fo:keep-with-next="always"/> - <style:text-properties fo:color="#aa610d" loext:opacity="100%" style:font-name="Calibri Light" fo:font-family="'Calibri Light'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="13pt" style:font-name-asian="F" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="13pt" style:font-name-complex="F" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="13pt"> + <style:text-properties fo:color="#aa610d" loext:opacity="100%" style:font-name="Noto Serif" fo:font-family="'Noto Serif'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="13pt" style:font-name-asian="F" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="13pt" style:font-name-complex="F" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="13pt"> <loext:char-complex-color loext:theme-type="accent1"> <loext:transformation loext:type="shade" loext:value="2539"/> </loext:char-complex-color> @@ -216,14 +216,14 @@ </style:style> <style:style style:name="Default_20_Paragraph_20_Font_20__28_WW_29_" style:display-name="Default Paragraph Font (WW)" style:family="text"/> <style:style style:name="Heading_20_1_20_Char" style:display-name="Heading 1 Char" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font_20__28_WW_29_" loext:linked-style-name="Heading_20_1"> - <style:text-properties fo:color="#aa610d" loext:opacity="100%" style:font-name="Calibri Light" fo:font-family="'Calibri Light'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="16pt" style:font-name-asian="F" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="16pt" style:font-name-complex="F" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="16pt"> + <style:text-properties fo:color="#aa610d" loext:opacity="100%" style:font-name="Noto Serif" fo:font-family="'Noto Serif'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="16pt" style:font-name-asian="F" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="16pt" style:font-name-complex="F" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="16pt"> <loext:char-complex-color loext:theme-type="accent1"> <loext:transformation loext:type="shade" loext:value="2539"/> </loext:char-complex-color> </style:text-properties> </style:style> <style:style style:name="Heading_20_2_20_Char" style:display-name="Heading 2 Char" style:family="text" style:parent-style-name="Default_20_Paragraph_20_Font_20__28_WW_29_" loext:linked-style-name="Heading_20_2"> - <style:text-properties fo:color="#aa610d" loext:opacity="100%" style:font-name="Calibri Light" fo:font-family="'Calibri Light'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="13pt" style:font-name-asian="F" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="13pt" style:font-name-complex="F" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="13pt"> + <style:text-properties fo:color="#aa610d" loext:opacity="100%" style:font-name="Noto Serif" fo:font-family="'Noto Serif'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="13pt" style:font-name-asian="F" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="13pt" style:font-name-complex="F" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="13pt"> <loext:char-complex-color loext:theme-type="accent1"> <loext:transformation loext:type="shade" loext:value="2539"/> </loext:char-complex-color> @@ -388,4 +388,4 @@ <text:p text:style-name="Standard" loext:marker-style-name="T1"><text:span text:style-name="T1">This is a test document in the “Orange” theme.</text:span></text:p> </office:text> </office:body> -</office:document> \ No newline at end of file +</office:document>
