sw/qa/extras/layout/data/tdf126154.fodt | 2 +-
sw/qa/extras/layout/data/tdf126154_minimum_shrinking.fodt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 170a12a2a38f1424d60d0cacfbdf8fae0f441fa2
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri May 9 11:44:57 2025 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri May 9 12:50:10 2025 +0200
CppunitTest_sw_layoutwriter3: fix en-GB vs en-US mismatch
The test code at testTdf126154_minimum_shrinking and testTdf126154
checked if en-US hyph data is available, but the documents worked with
an en-GB locale, so it could happen that you had en-US installed and
then the test failed if en-GB was not installed.
Adapt the test documents to the test code to fix the inconsistency.
Change-Id: I826db1bdb19bb383ee8e992eac64495670889d7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185090
Tested-by: Jenkins
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/sw/qa/extras/layout/data/tdf126154.fodt
b/sw/qa/extras/layout/data/tdf126154.fodt
index b8748d1f973d..78347e0a33f9 100644
--- a/sw/qa/extras/layout/data/tdf126154.fodt
+++ b/sw/qa/extras/layout/data/tdf126154.fodt
@@ -175,7 +175,7 @@
</style:default-style>
<style:style style:name="Standard" style:family="paragraph"
style:class="text">
<style:paragraph-properties fo:margin-top="0pt" fo:margin-bottom="0pt"
style:contextual-spacing="false" fo:text-align="start"
style:justify-single-word="false" fo:orphans="2" fo:widows="2"
style:writing-mode="lr-tb"/>
- <style:text-properties style:font-name="Liberation Sans"
fo:font-family="Liberation Sans" fo:font-size="10pt" fo:language="en"
fo:country="GB"/>
+ <style:text-properties style:font-name="Liberation Sans"
fo:font-family="Liberation Sans" fo:font-size="10pt" fo:language="en"
fo:country="US"/>
</style:style>
<style:style style:name="Text_20_body" style:display-name="Text body"
style:family="paragraph" style:parent-style-name="Standard" style:class="text">
<style:paragraph-properties fo:margin-top="0pt" fo:margin-bottom="7pt"
style:contextual-spacing="false" fo:line-height="115%"/>
diff --git a/sw/qa/extras/layout/data/tdf126154_minimum_shrinking.fodt
b/sw/qa/extras/layout/data/tdf126154_minimum_shrinking.fodt
index 38a62c9d5032..b9d4a76a2499 100644
--- a/sw/qa/extras/layout/data/tdf126154_minimum_shrinking.fodt
+++ b/sw/qa/extras/layout/data/tdf126154_minimum_shrinking.fodt
@@ -175,7 +175,7 @@
</style:default-style>
<style:style style:name="Standard" style:family="paragraph"
style:class="text">
<style:paragraph-properties fo:margin-top="0pt" fo:margin-bottom="0pt"
style:contextual-spacing="false" fo:text-align="start"
style:justify-single-word="false" fo:orphans="2" fo:widows="2"
style:writing-mode="lr-tb"/>
- <style:text-properties style:font-name="Liberation Sans"
fo:font-family="Liberation Sans" fo:font-size="10pt" fo:language="en"
fo:country="GB"/>
+ <style:text-properties style:font-name="Liberation Sans"
fo:font-family="Liberation Sans" fo:font-size="10pt" fo:language="en"
fo:country="US"/>
</style:style>
<style:style style:name="Text_20_body" style:display-name="Text body"
style:family="paragraph" style:parent-style-name="Standard" style:class="text">
<style:paragraph-properties fo:margin-top="0pt" fo:margin-bottom="7pt"
style:contextual-spacing="false" fo:line-height="115%"/>
