|
 |
f0633d |
From 494e4accc0634befb6ed7534faf3e2519bf5cca1 Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
Date: Fri, 20 Dec 2013 17:12:00 +0100
|
|
|
f0633d |
Subject: [PATCH 081/109] prepare to read loext:vertical-justify, fdo#72922
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I56d72d5cb8ea95aa63d4659899cba2f295ce9bea
|
|
|
f0633d |
(cherry picked from commit 11a73705d9dd10ebefa2bcdefa560f55e7024a1b)
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7150
|
|
|
f0633d |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f0633d |
---
|
|
|
f0633d |
sc/source/filter/xml/xmlstyle.cxx | 6 +++++-
|
|
|
f0633d |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
|
|
|
f0633d |
index 88fdef7..3264a5d 100644
|
|
|
f0633d |
--- a/sc/source/filter/xml/xmlstyle.cxx
|
|
|
f0633d |
+++ b/sc/source/filter/xml/xmlstyle.cxx
|
|
|
f0633d |
@@ -55,7 +55,10 @@ using namespace ::xmloff::token;
|
|
|
f0633d |
using namespace ::formula;
|
|
|
f0633d |
|
|
|
f0633d |
#define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010, false }
|
|
|
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 |
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010, false }
|
|
|
f0633d |
|
|
|
f0633d |
const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
|
|
|
f0633d |
@@ -106,7 +109,8 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
|
|
|
f0633d |
MAP( "UserDefinedAttributes", XML_NAMESPACE_TEXT, XML_XMLNS, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
|
|
|
f0633d |
MAP( "ValidationXML", XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ),
|
|
|
f0633d |
MAP( "VertJustify", XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY, 0),
|
|
|
f0633d |
- MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 0 ),
|
|
|
f0633d |
+ MAP_EXT( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 0 ), // proposed ODF 1.2+
|
|
|
f0633d |
+ MAP_EXT_I( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_LO_EXT, XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 0 ), // extension namespace
|
|
|
f0633d |
MAP_END()
|
|
|
f0633d |
};
|
|
|
f0633d |
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|