sc/source/filter/xml/xmlbodyi.cxx | 5 +++++ sc/source/filter/xml/xmlimprt.cxx | 1 + 2 files changed, 6 insertions(+)
New commits: commit b8159be15ae420d58dbf27dff0af80f2856a038f Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Dec 8 00:42:08 2014 +0100 import part for "put that attribute into an extension namespace" See master commit 6f55edf340ea83d02e5ba60d05df868a4a04a2c0 Change-Id: Ie3618e44416a0765877e4b09e41e058d2808cdee Signed-off-by: Michael Stahl <mst...@redhat.com> diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 56dba8c..5abc841 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 e1b73fe..379bb52 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 }; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits