|
 |
f0633d |
From 3d7011c3c2b47aca273d7e8a26bdaeaf982d8702 Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f0633d |
Date: Sat, 28 Dec 2013 12:44:02 +0100
|
|
|
f0633d |
Subject: [PATCH 106/109] read elements/attribs written to extension namespace
|
|
|
f0633d |
|
|
|
f0633d |
Related to validation errors with fdo#31296
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: I1b76e05a9996b1123db164629475a3f7b07dda69
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7222
|
|
|
f0633d |
Reviewed-by: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
Tested-by: Eike Rathke <erack@redhat.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
sc/source/filter/xml/xmlimprt.cxx | 3 +++
|
|
|
f0633d |
sc/source/filter/xml/xmlimprt.hxx | 5 ++++-
|
|
|
f0633d |
sc/source/filter/xml/xmltabi.cxx | 3 +++
|
|
|
f0633d |
3 files changed, 10 insertions(+), 1 deletion(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
|
|
|
f0633d |
index 28c3ace..3378541 100644
|
|
|
f0633d |
--- a/sc/source/filter/xml/xmlimprt.cxx
|
|
|
f0633d |
+++ b/sc/source/filter/xml/xmlimprt.cxx
|
|
|
f0633d |
@@ -828,6 +828,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap()
|
|
|
f0633d |
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS },
|
|
|
f0633d |
{ XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL },
|
|
|
f0633d |
{ XML_NAMESPACE_TABLE, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION },
|
|
|
f0633d |
+ { XML_NAMESPACE_OFFICE_EXT, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION_EXT },
|
|
|
f0633d |
{ XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP },
|
|
|
f0633d |
{ XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS },
|
|
|
f0633d |
{ XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS },
|
|
|
f0633d |
@@ -856,6 +857,8 @@ const SvXMLTokenMap& ScXMLImport::GetTableProtectionAttrTokenMap()
|
|
|
f0633d |
{
|
|
|
f0633d |
{ XML_NAMESPACE_TABLE, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS },
|
|
|
f0633d |
{ XML_NAMESPACE_TABLE, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS },
|
|
|
f0633d |
+ { XML_NAMESPACE_OFFICE_EXT, XML_SELECT_PROTECTED_CELLS, XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT },
|
|
|
f0633d |
+ { XML_NAMESPACE_OFFICE_EXT, XML_SELECT_UNPROTECTED_CELLS, XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT },
|
|
|
f0633d |
XML_TOKEN_MAP_END
|
|
|
f0633d |
};
|
|
|
f0633d |
pTableProtectionElemTokenMap = new SvXMLTokenMap(aTableProtectionTokenMap);
|
|
|
f0633d |
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
|
|
|
f0633d |
index 0957a9f..3fb584a 100644
|
|
|
f0633d |
--- a/sc/source/filter/xml/xmlimprt.hxx
|
|
|
f0633d |
+++ b/sc/source/filter/xml/xmlimprt.hxx
|
|
|
f0633d |
@@ -240,6 +240,7 @@ enum ScXMLTableTokens
|
|
|
f0633d |
XML_TOK_TABLE_ROW_GROUP,
|
|
|
f0633d |
XML_TOK_TABLE_HEADER_ROWS,
|
|
|
f0633d |
XML_TOK_TABLE_PROTECTION,
|
|
|
f0633d |
+ XML_TOK_TABLE_PROTECTION_EXT,
|
|
|
f0633d |
XML_TOK_TABLE_ROWS,
|
|
|
f0633d |
XML_TOK_TABLE_ROW,
|
|
|
f0633d |
XML_TOK_TABLE_SOURCE,
|
|
|
f0633d |
@@ -254,7 +255,9 @@ enum ScXMLTableTokens
|
|
|
f0633d |
enum ScXMLTokenProtectionTokens
|
|
|
f0633d |
{
|
|
|
f0633d |
XML_TOK_TABLE_SELECT_PROTECTED_CELLS,
|
|
|
f0633d |
- XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS
|
|
|
f0633d |
+ XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS,
|
|
|
f0633d |
+ XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT,
|
|
|
f0633d |
+ XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT
|
|
|
f0633d |
};
|
|
|
f0633d |
|
|
|
f0633d |
enum ScXMLTableRowsTokens
|
|
|
f0633d |
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
|
|
|
f0633d |
index a1bc801..f15a602 100644
|
|
|
f0633d |
--- a/sc/source/filter/xml/xmltabi.cxx
|
|
|
f0633d |
+++ b/sc/source/filter/xml/xmltabi.cxx
|
|
|
f0633d |
@@ -286,6 +286,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
|
|
|
f0633d |
rLName, xAttrList );
|
|
|
f0633d |
break;
|
|
|
f0633d |
case XML_TOK_TABLE_PROTECTION:
|
|
|
f0633d |
+ case XML_TOK_TABLE_PROTECTION_EXT:
|
|
|
f0633d |
pContext = new ScXMLTableProtectionContext( GetScImport(), nPrefix, rLName, xAttrList );
|
|
|
f0633d |
break;
|
|
|
f0633d |
case XML_TOK_TABLE_ROW_GROUP:
|
|
|
f0633d |
@@ -454,9 +455,11 @@ ScXMLTableProtectionContext::ScXMLTableProtectionContext(
|
|
|
f0633d |
switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
|
|
|
f0633d |
{
|
|
|
f0633d |
case XML_TOK_TABLE_SELECT_PROTECTED_CELLS:
|
|
|
f0633d |
+ case XML_TOK_TABLE_SELECT_PROTECTED_CELLS_EXT:
|
|
|
f0633d |
bSelectProtectedCells = IsXMLToken(aValue, XML_TRUE);
|
|
|
f0633d |
break;
|
|
|
f0633d |
case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS:
|
|
|
f0633d |
+ case XML_TOK_TABLE_SELECT_UNPROTECTED_CELLS_EXT:
|
|
|
f0633d |
bSelectUnprotectedCells = IsXMLToken(aValue, XML_TRUE);
|
|
|
f0633d |
break;
|
|
|
f0633d |
default:
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|