commit 643db96e933fd03a4e22e1d214a305608e816463
author Adam Co <rattles2013@gmail.com> Thu Jul 11 16:40:50 2013 +0300
committer Thorsten Behrens <tbehrens@suse.com> Wed Aug 14 16:03:07 2013 +0000
tree 83c6deed88e6ed197fc2ba881e86ac67b2fb78e0
parent de9b067bd13ec6632b49c9683255bd3a1d7ae13e

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>

include/xmloff/xmltoken.hxx

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index be3bbde..51522f1 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,

sw/source/core/unocore/unomap.cxx

diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx
index f9d71a66..d9e56b2 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 },

xmloff/source/core/xmltoken.cxx

diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 37742e3..ac3d095 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 ),

xmloff/source/text/txtprmap.cxx

diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 079f01bd..21e5aaf 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 ),