summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport14.cxx7
-rw-r--r--sw/source/writerfilter/dmapper/SettingsTable.cxx2
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)