diff options
| author | Adam Co <rattles2013@gmail.com> | 2013-07-11 16:40:50 +0300 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-08-14 16:03:07 +0000 |
| commit | 643db96e933fd03a4e22e1d214a305608e816463 (patch) | |
| tree | 83c6deed88e6ed197fc2ba881e86ac67b2fb78e0 | |
| parent | de9b067bd13ec6632b49c9683255bd3a1d7ae13e (diff) | |
add character shading value to ODT filters
The attribute is only exported for ODF versions > 1.2; use the new
loext (LO_EXT) namespace.
Change-Id: Ie44e4b851c4adf52d8cc4fc2cbe37d6c3a9941d8
Reviewed-on: https://gerrit.libreoffice.org/4830
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>
| -rw-r--r-- | include/xmloff/xmltoken.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/unocore/unomap.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/text/txtprmap.cxx | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index be3bbde47605..51522f17797b 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -399,6 +399,7 @@ namespace xmloff { namespace token { XML_CHANGED_REGION, XML_CHAPTER, XML_CHAR, + XML_CHAR_SHADING_VALUE, XML_CHARACTER_COUNT, XML_CHART, XML_CHARTS, diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index f9d71a665227..d9e56b2b4619 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -649,6 +649,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s { SW_PROP_NMID(UNO_NAME_CHAR_SCALE_WIDTH), RES_CHRATR_SCALEW, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, 0 }, { SW_PROP_NMID(UNO_NAME_CHAR_RELIEF), RES_CHRATR_RELIEF, CPPU_E2T(CPPUTYPE_INT16), PROPERTY_NONE, MID_RELIEF }, { SW_PROP_NMID(UNO_NAME_CHAR_AUTO_STYLE_NAME), RES_TXTATR_AUTOFMT, CPPU_E2T(CPPUTYPE_OUSTRING), PropertyAttribute::MAYBEVOID, 0}, + { SW_PROP_NMID(UNO_NAME_CHAR_SHADING_VALUE), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, MID_SHADING_VALUE }, { SW_PROP_NMID(UNO_NAME_CHAR_LEFT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, LEFT_BORDER |CONVERT_TWIPS }, { SW_PROP_NMID(UNO_NAME_CHAR_RIGHT_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, RIGHT_BORDER |CONVERT_TWIPS }, { SW_PROP_NMID(UNO_NAME_CHAR_TOP_BORDER), RES_CHRATR_BOX, CPPU_E2T(CPPUTYPE_BORDERLINE), PROPERTY_NONE, TOP_BORDER |CONVERT_TWIPS }, diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 37742e3f4476..ac3d0956b62b 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -403,6 +403,7 @@ namespace xmloff { namespace token { TOKEN( "changed-region", XML_CHANGED_REGION ), TOKEN( "chapter", XML_CHAPTER ), TOKEN( "char", XML_CHAR ), + TOKEN( "char-shading-value", XML_CHAR_SHADING_VALUE ), TOKEN( "character-count", XML_CHARACTER_COUNT ), TOKEN( "chart", XML_CHART ), TOKEN( "charts", XML_CHARTS ), diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index 079f01bdadc1..21e5aaf2f0e5 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -460,6 +460,7 @@ XMLPropertyMapEntry aXMLTextPropMap[] = // RES_CHRATR_BACKGROUND MT_E( "CharBackColor", FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, 0 ), MT_E( "CharBackTransparent", FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + { "CharShadingValue", sizeof("CharShadingValue")-1, XML_NAMESPACE_LO_EXT, XML_CHAR_SHADING_VALUE, XML_TYPE_NUMBER|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT }, MT_E( "CharBackColor", FO, TEXT_BACKGROUND_COLOR, XML_TYPE_COLOR|MID_FLAG_SPECIAL_ITEM_EXPORT, CTF_OLDTEXTBACKGROUND ), // RES_CHRATR_CJK_FONT MT_ED( "CharFontNameAsian", STYLE, FONT_NAME_ASIAN, XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME_CJK ), |