diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-08 00:42:08 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-12-15 13:53:42 +0200 |
| commit | b07d180197a9ad67c84d4d35ddc56de0f5df40cf (patch) | |
| tree | 75655b5ad689123b95b32ab47861dee0836d905c | |
| parent | import part for: "related fdo#45266, don't write extension elements into (diff) | |
| download | core-b07d180197a9ad67c84d4d35ddc56de0f5df40cf.tar.gz core-b07d180197a9ad67c84d4d35ddc56de0f5df40cf.zip | |
import part for "put that attribute into an extension namespace"
See master commit 6f55edf340ea83d02e5ba60d05df868a4a04a2c0
Change-Id: Ie3618e44416a0765877e4b09e41e058d2808cdee
Signed-off-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sc/source/filter/xml/xmlbodyi.cxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 56dba8c2d2af..5abc8410ab87 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -114,6 +114,11 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, else if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2)) meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue); } + else if(nPrefix == XML_NAMESPACE_LO_EXT) + { + if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2)) + meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue); + } } } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index e1b73fe9d3b0..379bb524d08a 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -910,6 +910,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableAttrTokenMap() { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, XML_TOK_TABLE_PASSWORD }, { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, XML_TOK_TABLE_PASSHASH }, { XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, XML_TOK_TABLE_PASSHASH_2 }, + { XML_NAMESPACE_LO_EXT, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, XML_TOK_TABLE_PASSHASH_2 }, { XML_NAMESPACE_TABLE, XML_PRINT, XML_TOK_TABLE_PRINT }, XML_TOKEN_MAP_END }; |