diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-11 11:13:13 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-11 17:03:28 +0100 |
| commit | 19762e8b96f16504e6e7607f96ff9c5c62e9e35c (patch) | |
| tree | 2c9951ad0e1dec45bde1d7260cdb40cc1eff8d6f /sw/source/filter/ww8/docxexport.cxx | |
| parent | 18101d292f6a8de2ae45b49193b4c6e3c99a332f (diff) | |
DOCX export: don't write w:suppressAutoHyphens unconditionally
Change-Id: I0e716f1c6d5034774247264cd098ede14601f751
Diffstat (limited to 'sw/source/filter/ww8/docxexport.cxx')
| -rw-r--r-- | sw/source/filter/ww8/docxexport.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 197eac9a1bcc..6cb7d80adebd 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -1348,11 +1348,13 @@ XFastAttributeListRef DocxExport::MainXmlNamespaces( FSHelperPtr serializer ) return XFastAttributeListRef( pAttr ); } -bool DocxExport::ignoreAttributeForStyles( sal_uInt16 nWhich ) const +bool DocxExport::ignoreAttributeForStyleDefaults( sal_uInt16 nWhich ) const { if( nWhich == RES_TEXTGRID ) return true; // w:docGrid is written only to document.xml, not to styles.xml - return MSWordExportBase::ignoreAttributeForStyles( nWhich ); + if (nWhich == RES_PARATR_HYPHENZONE) + return true; // w:suppressAutoHyphens is only a formatting exception, not a default + return MSWordExportBase::ignoreAttributeForStyleDefaults( nWhich ); } void DocxExport::WriteOutliner(const OutlinerParaObject& rParaObj, sal_uInt8 nTyp) |