diff options
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/inc/xmlprop.hxx | 1 | ||||
-rw-r--r-- | xmloff/source/core/xmltoken.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 1 | ||||
-rw-r--r-- | xmloff/source/style/prhdlfac.cxx | 5 | ||||
-rw-r--r-- | xmloff/source/token/tokens.txt | 2 |
5 files changed, 11 insertions, 0 deletions
diff --git a/xmloff/inc/xmlprop.hxx b/xmloff/inc/xmlprop.hxx index 3b2cd86816bc..b93bf926e569 100644 --- a/xmloff/inc/xmlprop.hxx +++ b/xmloff/inc/xmlprop.hxx @@ -611,6 +611,7 @@ inline constexpr OUStringLiteral PROP_TextAutoGrowWidth = u"TextAutoGrowWidth"; inline constexpr OUStringLiteral PROP_TextBreak = u"TextBreak"; inline constexpr OUStringLiteral PROP_TextCanOverlap = u"TextCanOverlap"; inline constexpr OUStringLiteral PROP_TextChainNextName = u"TextChainNextName"; +inline constexpr OUStringLiteral PROP_TextClipVerticalOverflow = u"TextClipVerticalOverflow"; inline constexpr OUStringLiteral PROP_TextColor = u"TextColor"; inline constexpr OUStringLiteral PROP_TextColumns = u"TextColumns"; inline constexpr OUStringLiteral PROP_TextContourFrame = u"TextContourFrame"; diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index daa658011ae3..43d47aec8cae 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -299,6 +299,7 @@ namespace xmloff::token { TOKEN( "author-name", XML_AUTHOR_NAME ), TOKEN( "auto", XML_AUTO ), TOKEN( "auto-complete", XML_AUTO_COMPLETE ), + TOKEN( "auto-create-new-frame", XML_AUTO_CREATE_NEW_FRAME ), TOKEN( "auto-grow-height", XML_AUTO_GROW_HEIGHT ), TOKEN( "auto-grow-width", XML_AUTO_GROW_WIDTH ), TOKEN( "auto-reload", XML_AUTO_RELOAD ), @@ -1468,6 +1469,7 @@ namespace xmloff::token { TOKEN( "outline-style", XML_OUTLINE_STYLE ), TOKEN( "outset", XML_OUTSET ), TOKEN( "outside", XML_OUTSIDE ), + TOKEN( "overflow-behavior", XML_OVERFLOW_BEHAVIOR ), TOKEN( "overlap", XML_OVERLAP ), TOKEN( "overlay", XML_OVERLAY ), TOKEN( "p", XML_P ), diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index de7030f8efff..03e37c97bc2e 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -150,6 +150,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAP( PROP_NumberingRules, XML_NAMESPACE_TEXT, XML_LIST_STYLE_NAME, XML_TYPE_STRING, CTF_SD_NUMBERINGRULES_NAME ), GMAP( PROP_TextWordWrap, XML_NAMESPACE_FO, XML_WRAP_OPTION, XML_TYPE_WRAP_OPTION, 0 ), GMAP( PROP_TextChainNextName, XML_NAMESPACE_DRAW, XML_CHAIN_NEXT_NAME, XML_TYPE_STRING, 0 ), + GMAP( PROP_TextClipVerticalOverflow, XML_NAMESPACE_STYLE, XML_OVERFLOW_BEHAVIOR, XML_TYPE_TEXT_OVERFLOW_BEHAVIOR, 0 ), GMAP( PROP_TextColumns, XML_NAMESPACE_STYLE, XML_COLUMNS, XML_TYPE_TEXT_COLUMNS|MID_FLAG_ELEMENT_ITEM, CTF_TEXTCOLUMNS ), diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx index 3b8cbe371000..5ff7172834e4 100644 --- a/xmloff/source/style/prhdlfac.cxx +++ b/xmloff/source/style/prhdlfac.cxx @@ -469,6 +469,11 @@ std::unique_ptr<XMLPropertyHandler> XMLPropertyHandlerFactory::CreatePropertyHan case XML_TYPE_TEXT_VERTICAL_POS: pPropHdl.reset(new XMLConstantsPropertyHandler( pXML_VertPos_Enum, XML_TOKEN_INVALID )); break; + case XML_TYPE_TEXT_OVERFLOW_BEHAVIOR: + // auto-create-new-frame isn't properly implemented yet. It just means don't clip. + pPropHdl.reset(new XMLNamedBoolPropertyHdl(GetXMLToken(XML_CLIP), + GetXMLToken(XML_AUTO_CREATE_NEW_FRAME))); + break; } diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index 098d8dd4c501..5e60e58b2b73 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -204,6 +204,7 @@ author-initials author-name auto auto-complete +auto-create-new-frame auto-grow-height auto-grow-width auto-reload @@ -1368,6 +1369,7 @@ outline-level-style outline-style outset outside +overflow-behavior overlap overlay p |