diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-28 12:44:02 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-01-06 11:44:03 +0000 |
| commit | 3d7011c3c2b47aca273d7e8a26bdaeaf982d8702 (patch) | |
| tree | 17590da1f6420f931917fdeb2b79b3c6a11b199a /sc | |
| parent | a487e676ef96d1e6e2efa8680385720667790a60 (diff) | |
read elements/attribs written to extension namespace
Related to validation errors with fdo#31296
Change-Id: I1b76e05a9996b1123db164629475a3f7b07dda69
Reviewed-on: https://gerrit.libreoffice.org/7222
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 3 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.hxx | 5 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmltabi.cxx | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 28c3ace17e3f..3378541404c1 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -828,6 +828,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_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 }, { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, @@ -856,6 +857,8 @@ 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_OFFICE_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/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 0957a9f2973a..3fb584a9377e 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -240,6 +240,7 @@ enum ScXMLTableTokens XML_TOK_TABLE_ROW_GROUP, XML_TOK_TABLE_HEADER_ROWS, XML_TOK_TABLE_PROTECTION, + XML_TOK_TABLE_PROTECTION_EXT, XML_TOK_TABLE_ROWS, XML_TOK_TABLE_ROW, XML_TOK_TABLE_SOURCE, @@ -254,7 +255,9 @@ enum ScXMLTableTokens enum ScXMLTokenProtectionTokens { XML_TOK_TABLE_SELECT_PROTECTED_CELLS, - XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS + XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS, + XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT, + XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT }; enum ScXMLTableRowsTokens diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index a1bc801108b7..f15a6022ee3e 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -286,6 +286,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, rLName, xAttrList ); break; case XML_TOK_TABLE_PROTECTION: + case XML_TOK_TABLE_PROTECTION_EXT: pContext = new ScXMLTableProtectionContext( GetScImport(), nPrefix, rLName, xAttrList ); break; case XML_TOK_TABLE_ROW_GROUP: @@ -454,9 +455,11 @@ ScXMLTableProtectionContext::ScXMLTableProtectionContext( switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName)) { case XML_TOK_TABLE_SELECT_PROTECTED_CELLS: + case XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT: bSelectProtectedCells = IsXMLToken(aValue, XML_TRUE); break; case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS: + case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT: bSelectUnprotectedCells = IsXMLToken(aValue, XML_TRUE); break; default: |