diff options
Diffstat (limited to 'xmloff/source')
-rw-r--r-- | xmloff/source/text/txtprhdl.cxx | 13 | ||||
-rw-r--r-- | xmloff/source/text/txtprmap.cxx | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index f7c3a9790dda..a80a2804b0ea 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/text/RubyPosition.hpp> #include <com/sun/star/text/FontEmphasis.hpp> +#include <com/sun/star/text/ParagraphHyphenationKeepType.hpp> #include <com/sun/star/text/ParagraphVertAlign.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <sax/tools/converter.hxx> @@ -231,6 +232,14 @@ SvXMLEnumMapEntry<sal_uInt16> const pXML_ParaVerticalAlign_Enum[] = { XML_TOKEN_INVALID, 0 } }; +SvXMLEnumMapEntry<sal_uInt16> const pXML_ParaHyphenationKeep_Enum[] = +{ + { XML_AUTO, ParagraphHyphenationKeepType::AUTO }, + // keep page and column for interoperability + { XML_PAGE, ParagraphHyphenationKeepType::COLUMN }, + { XML_TOKEN_INVALID, 0 } +}; + // OD 2004-05-05 #i28701# SvXMLEnumMapEntry<sal_uInt16> const pXML_WrapInfluenceOnPosition_Enum[] = { @@ -1415,6 +1424,10 @@ static const XMLPropertyHandler *GetPropertyHandler case XML_TYPE_COMPLEX_COLOR: pHdl = new XMLComplexColorHandler; break; + case XML_TYPE_HYPHENATION_KEEP: + pHdl = new XMLConstantsPropertyHandler( pXML_ParaHyphenationKeep_Enum, XML_TOKEN_INVALID ); + break; + default: { OSL_ENSURE(false, "XMLPropertyHandler missing (!)"); diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index 98d347d9edbe..05a3284ffbc3 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -345,6 +345,7 @@ XMLPropertyMapEntry constexpr aXMLParaPropMap[] = MAP_EXT( PROP_ParaHyphenationNoLastWord, XML_NAMESPACE_LO_EXT, XML_HYPHENATION_NO_LAST_WORD, XML_TYPE_BOOL|XML_TYPE_PROP_TEXT, 0 ), MAP_EXT( PROP_ParaHyphenationMinWordLength, XML_NAMESPACE_LO_EXT, XML_HYPHENATION_WORD_CHAR_COUNT, XML_TYPE_NUMBER16_NONE|XML_TYPE_PROP_TEXT, 0 ), MAP_EXT( PROP_ParaHyphenationZone, XML_NAMESPACE_LO_EXT, XML_HYPHENATION_ZONE, XML_TYPE_NUMBER16_NONE|XML_TYPE_PROP_TEXT, 0 ), + MP_E( PROP_ParaHyphenationKeep, XML_NAMESPACE_FO, XML_HYPHENATION_KEEP, XML_TYPE_HYPHENATION_KEEP, 0 ), // RES_PARATR_DROP MP_E( PROP_DropCapWholeWord, XML_NAMESPACE_STYLE, XML_LENGTH, MID_FLAG_SPECIAL_ITEM|XML_TYPE_BOOL, CTF_DROPCAPWHOLEWORD ), MP_E( PROP_DropCapCharStyleName, XML_NAMESPACE_STYLE, XML_STYLE_NAME, MID_FLAG_SPECIAL_ITEM|XML_TYPE_STRING, CTF_DROPCAPCHARSTYLE ), |