|
 |
f0633d |
From 6c90074b8dcfbb10ab03acfa082ac746ea38df6e Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
Date: Fri, 20 Dec 2013 21:15:03 +0100
|
|
|
f0633d |
Subject: [PATCH 082/109] prepare to accept loext:contextual-spacing, fdo#58112
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I58e151743bf910b8b51f1b453e0bfcb4ed767d9d
|
|
|
f0633d |
(cherry picked from commit ef5e7b69440baa9f222d1ec870668d31d08268f0)
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7151
|
|
|
f0633d |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
---
|
|
|
f0633d |
xmloff/source/text/txtprmap.cxx | 8 +++++++-
|
|
|
f0633d |
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
|
|
|
f0633d |
index 26d04d8..abdba43 100644
|
|
|
f0633d |
--- a/xmloff/source/text/txtprmap.cxx
|
|
|
f0633d |
+++ b/xmloff/source/text/txtprmap.cxx
|
|
|
f0633d |
@@ -67,6 +67,11 @@ using namespace ::xmloff::token;
|
|
|
f0633d |
#define MR_E( a, p, l, t, c ) \
|
|
|
f0633d |
_M_E( a, p, l, (t|XML_TYPE_PROP_RUBY), c )
|
|
|
f0633d |
|
|
|
f0633d |
+// extensions import/export
|
|
|
f0633d |
+#define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }
|
|
|
f0633d |
+// extensions import only
|
|
|
f0633d |
+#define MAP_EXT_I(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_012_EXT_COMPAT, true }
|
|
|
f0633d |
+
|
|
|
f0633d |
#define M_END() \
|
|
|
f0633d |
{ NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false }
|
|
|
f0633d |
|
|
|
f0633d |
@@ -88,7 +93,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
|
|
|
f0633d |
MP_E( "ParaTopMarginRelative", FO, MARGIN_TOP, XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ),
|
|
|
f0633d |
MP_E( "ParaBottomMargin", FO, MARGIN_BOTTOM, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ),
|
|
|
f0633d |
MP_E( "ParaBottomMarginRelative",FO, MARGIN_BOTTOM, XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ),
|
|
|
f0633d |
- { "ParaContextMargin", sizeof("ParaContextMargin")-1, XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false },
|
|
|
f0633d |
+ MAP_EXT( "ParaContextMargin", XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // proposed ODF 1.2+
|
|
|
f0633d |
+ MAP_EXT_I( "ParaContextMargin", XML_NAMESPACE_LO_EXT, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0 ), // extension namespace
|
|
|
f0633d |
// RES_CHRATR_CASEMAP
|
|
|
f0633d |
MT_E( "CharCaseMap", FO, FONT_VARIANT, XML_TYPE_TEXT_CASEMAP_VAR, 0 ),
|
|
|
f0633d |
MT_E( "CharCaseMap", FO, TEXT_TRANSFORM, XML_TYPE_TEXT_CASEMAP, 0 ),
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|