diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-07 03:43:25 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-12-07 03:43:25 +0100 |
| commit | 6f55edf340ea83d02e5ba60d05df868a4a04a2c0 (patch) | |
| tree | fe6cdec4d289270c648b54cbe28cd20d43814e54 /sc | |
| parent | a4e4cdcdd7acfe779b2a3b244dd449f136308a93 (diff) | |
put that attribute into an extension namespace
Change-Id: I32f332bff332dd3e496e5d75c5660c2126a0905b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlbodyi.cxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 10 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index efb655fb7c5e..24e0860257fb 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/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 724c030b33bb..cf6f5c1f0460 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -1795,8 +1795,9 @@ void ScXMLExport::SetBodyAttributes() { AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, ScPassHashHelper::getHashURI(PASSHASH_XL)); - AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, - ScPassHashHelper::getHashURI(PASSHASH_SHA1)); + if (getDefaultVersion() > SvtSaveOptions::ODFVER_012) + AddAttribute(XML_NAMESPACE_LO_EXT, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, + ScPassHashHelper::getHashURI(PASSHASH_SHA1)); } else if (eHashUsed == PASSHASH_SHA1) AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, @@ -2914,8 +2915,9 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe { AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, ScPassHashHelper::getHashURI(PASSHASH_XL)); - AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, - ScPassHashHelper::getHashURI(PASSHASH_SHA1)); + if (getDefaultVersion() > SvtSaveOptions::ODFVER_012) + AddAttribute(XML_NAMESPACE_LO_EXT, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2, + ScPassHashHelper::getHashURI(PASSHASH_SHA1)); } else if (eHashUsed == PASSHASH_SHA1) AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM, diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 547dcbdffcc0..84c1ad898cbb 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -903,6 +903,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 }; |