diff options
| author | László Németh <nemeth@numbertext.org> | 2025-09-26 10:50:50 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2025-09-26 15:11:22 +0200 |
| commit | e03dbd2e30805c4d84e772e0509dd0fc1c8a89ae (patch) | |
| tree | dfeba5071ec72b3c6d61d1a4dca8ec989fd2da5d | |
| parent | ba03709243100b70c9f2fca315c0252e5f03ca0e (diff) | |
tdf#168528 sw letter spacing: fix false alarm with missing font
Font used by the test is embedded in the document, but
modules with enabled gb_CppunitTest_set_non_application_font_use
failed with false alarms. As a quick fix, move the test
into sw_core_text, where gb_CppunitTest_set_non_application_font_use
is not enabled, and revert the vcl exception added for the
test previously.
Regression by 8306c4e86aacfe0e2a7b2aedb88c404735dccdcd
"tdf#168528 sw letter spacing: fix freezing with minimum
spacing/scaling".
Change-Id: I8cad0977510e806596dba8eeb12cb28cc3dbf006
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191529
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
| -rw-r--r-- | sw/qa/core/text/data/tdf168528.odt (renamed from sw/qa/extras/layout/data/tdf168528.odt) | bin | 29979 -> 29979 bytes | |||
| -rw-r--r-- | sw/qa/core/text/text.cxx | 8 | ||||
| -rw-r--r-- | sw/qa/extras/layout/layout3.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 3 |
4 files changed, 8 insertions, 11 deletions
diff --git a/sw/qa/extras/layout/data/tdf168528.odt b/sw/qa/core/text/data/tdf168528.odt Binary files differindex 97608cc1eefe..97608cc1eefe 100644 --- a/sw/qa/extras/layout/data/tdf168528.odt +++ b/sw/qa/core/text/data/tdf168528.odt diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx index b81146642bd4..babaa4679ef8 100644 --- a/sw/qa/core/text/text.cxx +++ b/sw/qa/core/text/text.cxx @@ -1731,6 +1731,14 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf161990) } } +CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf168528) +{ + //just care it doesn't freeze + // embedded font subset created with: + // hb-subset SourceSerif4Variable-Roman.ttf -u '20,3a,61,64,65,66,67,68,6c,6d,6e,6f,72,73,74,75,79' -o subset.ttf + createSwDoc("tdf168528.odt"); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/layout/layout3.cxx b/sw/qa/extras/layout/layout3.cxx index d5f2ad01ef6e..9ad3c18412fd 100644 --- a/sw/qa/extras/layout/layout3.cxx +++ b/sw/qa/extras/layout/layout3.cxx @@ -837,14 +837,6 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf168448) } } -CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf168528) -{ - //just care it doesn't freeze - // embedded font subset created with: - // hb-subset SourceSerif4Variable-Roman.ttf -u '20,3a,61,64,65,66,67,68,6c,6d,6e,6f,72,73,74,75,79' -o subset.ttf - createSwDoc("tdf168528.odt"); -} - CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, testTdf164499) { createSwDoc("tdf164499.docx"); diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 8516a8b6ac9d..642a1a7ef733 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -1265,9 +1265,6 @@ void PrintFontManager::Substitute(vcl::font::FontSelectPattern &rPattern, OUStri } if (rPattern.maTargetName == "Linux Libertine G" && rPattern.maSearchName == "Linux Libertine O") return; - // tdf#168528 allow testing with embedded subset - if (rPattern.maTargetName == "Source Serif 4 Variable" && rPattern.maSearchName == "DejaVu Serif") - return; SAL_WARN("vcl.fonts", "PrintFontManager::Substitute: missing font: '" << rPattern.maTargetName << "' try: " << rPattern.maSearchName << " instead"); std::cerr << "terminating test due to missing font: " << rPattern.maTargetName << std::endl; |