[ooo-build-commit] .: xmloff/inc xmloff/source

[Kohei Yoshida]

 xmloff/inc/xmloff/xmltoken.hxx  |    5 +++++
 xmloff/source/core/xmltoken.cxx |    5 +++++
 2 files changed, 10 insertions(+)

New commits:
commit 7be276883e857f9e11cff3c6e31e976f36d29b92
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Sep 28 11:44:18 2010 -0400

    Ported calc-ods-sheet-protection-xmloff.diff from ooo-build.

diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index db2e3f9..3ea86c2 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -1411,6 +1411,8 @@ namespace xmloff { namespace token {
         XML_PROTECT_SIZE,
         XML_PROTECTED,
         XML_PROTECTION_KEY,
+        XML_PROTECTION_KEY_DIGEST_ALGORITHM,
+        XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
         XML_PRSUBSET,
         XML_PUBLISHER,
         XML_PUNCTUATION_WRAP,
@@ -1520,6 +1522,8 @@ namespace xmloff { namespace token {
         XML_SECTION_NAME,
         XML_SECTION_SOURCE,
         XML_SELECT_PAGE,
+        XML_SELECT_PROTECTED_CELLS,
+        XML_SELECT_UNPROTECTED_CELLS,
         XML_SELECTOR,
         XML_SEMANTICS,
         XML_SEMI_AUTOMATIC,
@@ -1732,6 +1736,7 @@ namespace xmloff { namespace token {
         XML_TABLE_OF_CONTENT_ENTRY_TEMPLATE,
         XML_TABLE_OF_CONTENT_SOURCE,
         XML_TABLE_PAGE,
+        XML_TABLE_PROTECTION,
         XML_TABLE_ROW,
         XML_TABLE_ROW_GROUP,
         XML_TABLE_ROWS,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 39db498..ba3840e 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1419,6 +1419,8 @@ namespace xmloff { namespace token {
         TOKEN( "size",                            XML_PROTECT_SIZE ),
         TOKEN( "protected",                       XML_PROTECTED ),
         TOKEN( "protection-key",                  XML_PROTECTION_KEY ),
+        TOKEN( "protection-key-digest-algorithm",   XML_PROTECTION_KEY_DIGEST_ALGORITHM ),
+        TOKEN( "protection-key-digest-algorithm-2", XML_PROTECTION_KEY_DIGEST_ALGORITHM_2 ),
         TOKEN( "prsubset",                        XML_PRSUBSET ),
         TOKEN( "publisher",                       XML_PUBLISHER ),
         TOKEN( "punctuation-wrap",                XML_PUNCTUATION_WRAP ),
@@ -1528,6 +1530,8 @@ namespace xmloff { namespace token {
         TOKEN( "section-name",                    XML_SECTION_NAME ),
         TOKEN( "section-source",                  XML_SECTION_SOURCE ),
         TOKEN( "select-page",                     XML_SELECT_PAGE ),
+        TOKEN( "select-protected-cells",          XML_SELECT_PROTECTED_CELLS ),
+        TOKEN( "select-unprotected-cells",        XML_SELECT_UNPROTECTED_CELLS ),
         TOKEN( "selector",                        XML_SELECTOR ),
         TOKEN( "semantics",                       XML_SEMANTICS ),
         TOKEN( "semi-automatic",                  XML_SEMI_AUTOMATIC ),
@@ -1740,6 +1744,7 @@ namespace xmloff { namespace token {
         TOKEN( "table-of-content-entry-template",     XML_TABLE_OF_CONTENT_ENTRY_TEMPLATE ),
         TOKEN( "table-of-content-source",         XML_TABLE_OF_CONTENT_SOURCE ),
         TOKEN( "table-page",                      XML_TABLE_PAGE ),
+        TOKEN( "table-protection",                XML_TABLE_PROTECTION ),
         TOKEN( "table-row",                       XML_TABLE_ROW ),
         TOKEN( "table-row-group",                 XML_TABLE_ROW_GROUP ),
         TOKEN( "table-rows",                      XML_TABLE_ROWS ),