diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:27:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:27:54 +0000 |
| commit | adb203bc05e3e36173cbd46b9951f79821a81799 (patch) | |
| tree | 6e6739df9b3f0a567330a0dd7ee0e03ae70876a3 /xmloff | |
| parent | Adding debian version 4:24.2.0-3. (diff) | |
| download | libreoffice-adb203bc05e3e36173cbd46b9951f79821a81799.tar.xz libreoffice-adb203bc05e3e36173cbd46b9951f79821a81799.zip | |
Merging upstream version 4:24.2.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/xmlprop.hxx | 1 | ||||
| -rw-r--r-- | xmloff/source/text/txtprmap.cxx | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xmloff/inc/xmlprop.hxx b/xmloff/inc/xmlprop.hxx index d93e0b89fb..89c53b72a8 100644 --- a/xmloff/inc/xmlprop.hxx +++ b/xmloff/inc/xmlprop.hxx @@ -94,6 +94,7 @@ inline constexpr OUString PROP_CharLeftBorderDistance = u"CharLeftBorderDistance inline constexpr OUString PROP_CharLocale = u"CharLocale"_ustr; inline constexpr OUString PROP_CharLocaleAsian = u"CharLocaleAsian"_ustr; inline constexpr OUString PROP_CharLocaleComplex = u"CharLocaleComplex"_ustr; +inline constexpr OUString PROP_CharNoHyphenation = u"CharNoHyphenation"_ustr; inline constexpr OUString PROP_CharOverline = u"CharOverline"_ustr; inline constexpr OUString PROP_CharOverlineColor = u"CharOverlineColor"_ustr; inline constexpr OUString PROP_CharOverlineHasColor = u"CharOverlineHasColor"_ustr; diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index cf6adc9a19..98d347d9ed 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -194,7 +194,7 @@ XMLPropertyMapEntry constexpr aXMLParaPropMap[] = // RES_CHRATR_BLINK MT_E( PROP_CharFlash, XML_NAMESPACE_STYLE, XML_TEXT_BLINKING, XML_TYPE_BOOL, 0 ), // RES_CHRATR_NOHYPHEN - // TODO: not used? + // TODO: only for words, PROP_ParaIsHyphenation is for paragraphs: check them // RES_CHRATR_UNUSED2 // RES_CHRATR_BACKGROUND MT_E( PROP_CharBackColor, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, CTF_CHAR_BACKGROUND ), @@ -546,7 +546,7 @@ XMLPropertyMapEntry constexpr aXMLTextPropMap[] = // RES_CHRATR_BLINK MT_E( PROP_CharFlash, XML_NAMESPACE_STYLE, XML_TEXT_BLINKING, XML_TYPE_BOOL, 0 ), // RES_CHRATR_NOHYPHEN - // TODO: not used? + MT_E( PROP_CharNoHyphenation, XML_NAMESPACE_FO, XML_HYPHENATE, XML_TYPE_NBOOL, 0 ), // RES_CHRATR_UNUSED2 // RES_CHRATR_BACKGROUND MT_E( PROP_CharBackColor, XML_NAMESPACE_FO, XML_BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, CTF_CHAR_BACKGROUND ), |