diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-24 14:58:51 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-09 09:17:23 +0200 |
| commit | 21ac2dae6a84b2c686abdbefb5d9bd10fed42680 (patch) | |
| tree | 7961cd9bb5564c8e963dfc819ef7d7b5f9b92207 /xmloff/source/text | |
| parent | 286ee5a966d5c729fef5cefd58b572247697c4fc (diff) | |
sc,xmloff: ODF 1.3: adapt XMLPropertyMapEntry
Map the following property attributes to ODFSVER_013:
* OFFICE-2173 table:tab-color
* OFFICE-3767 text:contextual-spacing
* OFFICE-3857 table:scale-to-X/table:scale-to-Y
Change-Id: I3585560a3654c71353bbcaf66da20eacba8ebd1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92861
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
Diffstat (limited to 'xmloff/source/text')
| -rw-r--r-- | xmloff/source/text/txtprmap.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx index 60ec65b66026..4f779c43cdc2 100644 --- a/xmloff/source/text/txtprmap.cxx +++ b/xmloff/source/text/txtprmap.cxx @@ -74,6 +74,8 @@ using namespace ::xmloff::token; #define MC_E( a, p, l, t, c ) \ M_E_( a, p, l, (t|XML_TYPE_PROP_TABLE_CELL), c ) +#define MAP_ODF13(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFSVER_013, false } + // extensions import/export #define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED, false } // extensions import only @@ -127,8 +129,8 @@ XMLPropertyMapEntry const aXMLParaPropMap[] = MP_E( "ParaTopMarginRelative", FO, MARGIN_TOP, XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ), MP_E( "ParaBottomMargin", FO, MARGIN_BOTTOM, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ), MP_E( "ParaBottomMarginRelative",FO, MARGIN_BOTTOM, XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ), - MAP_EXT_I( "ParaContextMargin", XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // proposed ODF 1.2+ and was written by LO<=4.2 - MAP_EXT( "ParaContextMargin", XML_NAMESPACE_LO_EXT, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // extension namespace + MAP_ODF13( "ParaContextMargin", XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // ODF 1.3 OFFICE-3767 and was written by LO<=4.2 + MAP_ODF13( "ParaContextMargin", XML_NAMESPACE_LO_EXT, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // extension namespace // RES_CHRATR_CASEMAP MT_E( "CharCaseMap", FO, FONT_VARIANT, XML_TYPE_TEXT_CASEMAP_VAR, 0 ), MT_E( "CharCaseMap", FO, TEXT_TRANSFORM, XML_TYPE_TEXT_CASEMAP, 0 ), |