diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-14 11:07:16 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-08-16 00:14:26 +0200 |
| commit | 2cc0109c0a1a8ff9a6bdb1cd5fc38f0c3520585a (patch) | |
| tree | 760e4e2e5b35f5be249ea16f92585522f41b7b0d | |
| parent | 0ad58a0a4501e4ee3762479f3d9d501ad85dec6c (diff) | |
use correct namespace for table protection elements, fdo#82128
Change-Id: I5b9cb4a76739a0c91597c0470c737439d2b07e4f
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmltabi.cxx | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 9c44f8d086ce..6e7b52de2596 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -2939,12 +2939,12 @@ void ScXMLExport::WriteTable(sal_Int32 nTable, const Reference<sheet::XSpreadshe if (pProtect && pProtect->isProtected() && getDefaultVersion() > SvtSaveOptions::ODFVER_012) { if (pProtect->isOptionEnabled(ScTableProtection::SELECT_LOCKED_CELLS)) - AddAttribute(XML_NAMESPACE_OFFICE_EXT, XML_SELECT_PROTECTED_CELLS, XML_TRUE); + AddAttribute(XML_NAMESPACE_LO_EXT, XML_SELECT_PROTECTED_CELLS, XML_TRUE); if (pProtect->isOptionEnabled(ScTableProtection::SELECT_UNLOCKED_CELLS)) - AddAttribute(XML_NAMESPACE_OFFICE_EXT, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE); + AddAttribute(XML_NAMESPACE_LO_EXT, XML_SELECT_UNPROTECTED_CELLS, XML_TRUE); OUString aElemName = GetNamespaceMap().GetQNameByKey( - XML_NAMESPACE_OFFICE_EXT, GetXMLToken(XML_TABLE_PROTECTION)); + XML_NAMESPACE_LO_EXT, GetXMLToken(XML_TABLE_PROTECTION)); SvXMLElementExport aElemProtected(*this, aElemName, true, true); } diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 5c817fa929d1..1b9d10ab874d 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -805,6 +805,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, { XML_NAMESPACE_TABLE, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION }, + { XML_NAMESPACE_LO_EXT, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION_EXT }, { XML_NAMESPACE_OFFICE_EXT, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION_EXT }, { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP }, { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, @@ -835,7 +836,9 @@ const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap() { XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS }, { XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS }, { XML_NAMESPACE_OFFICE_EXT, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT }, + { XML_NAMESPACE_LO_EXT, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT }, { XML_NAMESPACE_OFFICE_EXT, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT }, + { XML_NAMESPACE_LO_EXT, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT }, XML_TOKEN_MAP_END }; pTableProtectionElemTokenMap = new SvXMLTokenMap(aTableProtectionTokenMap); diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index b0f836dac78c..548763e966d7 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -459,7 +459,7 @@ ScXMLTableProtectionContext::ScXMLTableProtectionContext( bSelectUnprotectedCells = IsXMLToken(aValue, XML_TRUE); break; default: - ; + SAL_WARN("sc", "unknown attribute: " << aAttrName); } } |