diff options
| author | László Németh <nemeth@numbertext.org> | 2024-06-18 02:45:30 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-06-21 12:47:55 +0200 |
| commit | 4bdb612ae56b0cf30f5e6c40fcfae360260ddd52 (patch) | |
| tree | a18a9a65274b6c56325ac95bee84daca66ab2dbe /sw | |
| parent | f28ca4a018d12557c7e8a18658e5b2cc8e7877e0 (diff) | |
tdf#161628 DOCX import: set default hyphenation zone (1/4 inch)
Default value of hyphenationZone is 360 twips (0.25"). Apply this
value, if hyphenationZone is not defined, according to the OOXML
standard.
Follow-up to commit 5a079652c1b1f968a851f47995b0a65b84d2d192
"tdf#149421 DOCX: import/export hyphenation zone".
Change-Id: Idadae973d93a14fbbe828fa74562db6262c40904
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169070
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 8d8bc48b5efacde6f99d78a557cd052ce9e0ed07)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169104
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 7 | ||||
| -rw-r--r-- | sw/source/writerfilter/dmapper/SettingsTable.cxx | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx index ccd4c69d9757..d0e84df71295 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx @@ -787,6 +787,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf149421, "tdf121661.docx") } } +DECLARE_OOXMLEXPORT_TEST(testTdf149421_default, "tdf146171.docx") +{ + uno::Reference<beans::XPropertySet> xStyle(getStyles(u"ParagraphStyles"_ustr)->getByName(u"Standard"_ustr), uno::UNO_QUERY); + // This was 0 (not the default OOXML hyphenationZone) + CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int16>(360), getProperty<sal_Int16>(xStyle, u"ParaHyphenationZone"_ustr)); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf121658) { loadAndSave("tdf121658.docx"); diff --git a/sw/source/writerfilter/dmapper/SettingsTable.cxx b/sw/source/writerfilter/dmapper/SettingsTable.cxx index 4003eeed90d2..5d4642f0cb33 100644 --- a/sw/source/writerfilter/dmapper/SettingsTable.cxx +++ b/sw/source/writerfilter/dmapper/SettingsTable.cxx @@ -141,7 +141,7 @@ struct SettingsTable_Impl , m_bNoColumnBalance(false) , m_bAutoHyphenation(false) , m_bNoHyphenateCaps(false) - , m_nHyphenationZone(0) + , m_nHyphenationZone( 360 ) // default is 1/4 in , m_nUseWord2013TrackBottomHyphenation(-1) , m_nAllowHyphenationAtTrackBottom(-1) , m_bWidowControl(false) |