merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0168-calc-ods-sheet-protection-xmloff.diff
blob2f134058cd4eed696eebf2133dfa948ce948d161
1 diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
2 index 694138d..e2efd25 100644
3 --- xmloff/inc/xmloff/xmltoken.hxx
4 +++ xmloff/inc/xmloff/xmltoken.hxx
5 @@ -1410,6 +1410,8 @@ namespace xmloff { namespace token {
6 XML_PROTECT_SIZE,
7 XML_PROTECTED,
8 XML_PROTECTION_KEY,
9 + XML_PROTECTION_KEY_DIGEST_ALGORITHM,
10 + XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
11 XML_PRSUBSET,
12 XML_PUBLISHER,
13 XML_PUNCTUATION_WRAP,
14 @@ -1519,6 +1521,8 @@ namespace xmloff { namespace token {
15 XML_SECTION_NAME,
16 XML_SECTION_SOURCE,
17 XML_SELECT_PAGE,
18 + XML_SELECT_PROTECTED_CELLS,
19 + XML_SELECT_UNPROTECTED_CELLS,
20 XML_SELECTOR,
21 XML_SEMANTICS,
22 XML_SEMI_AUTOMATIC,
23 @@ -1731,6 +1735,7 @@ namespace xmloff { namespace token {
24 XML_TABLE_OF_CONTENT_ENTRY_TEMPLATE,
25 XML_TABLE_OF_CONTENT_SOURCE,
26 XML_TABLE_PAGE,
27 + XML_TABLE_PROTECTION,
28 XML_TABLE_ROW,
29 XML_TABLE_ROW_GROUP,
30 XML_TABLE_ROWS,
31 diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
32 index e90d4a6..4c16ec6 100644
33 --- xmloff/source/core/xmltoken.cxx
34 +++ xmloff/source/core/xmltoken.cxx
35 @@ -1418,6 +1418,8 @@ namespace xmloff { namespace token {
36 TOKEN( "size", XML_PROTECT_SIZE ),
37 TOKEN( "protected", XML_PROTECTED ),
38 TOKEN( "protection-key", XML_PROTECTION_KEY ),
39 + TOKEN( "protection-key-digest-algorithm", XML_PROTECTION_KEY_DIGEST_ALGORITHM ),
40 + TOKEN( "protection-key-digest-algorithm-2", XML_PROTECTION_KEY_DIGEST_ALGORITHM_2 ),
41 TOKEN( "prsubset", XML_PRSUBSET ),
42 TOKEN( "publisher", XML_PUBLISHER ),
43 TOKEN( "punctuation-wrap", XML_PUNCTUATION_WRAP ),
44 @@ -1527,6 +1529,8 @@ namespace xmloff { namespace token {
45 TOKEN( "section-name", XML_SECTION_NAME ),
46 TOKEN( "section-source", XML_SECTION_SOURCE ),
47 TOKEN( "select-page", XML_SELECT_PAGE ),
48 + TOKEN( "select-protected-cells", XML_SELECT_PROTECTED_CELLS ),
49 + TOKEN( "select-unprotected-cells", XML_SELECT_UNPROTECTED_CELLS ),
50 TOKEN( "selector", XML_SELECTOR ),
51 TOKEN( "semantics", XML_SEMANTICS ),
52 TOKEN( "semi-automatic", XML_SEMI_AUTOMATIC ),
53 @@ -1739,6 +1743,7 @@ namespace xmloff { namespace token {
54 TOKEN( "table-of-content-entry-template", XML_TABLE_OF_CONTENT_ENTRY_TEMPLATE ),
55 TOKEN( "table-of-content-source", XML_TABLE_OF_CONTENT_SOURCE ),
56 TOKEN( "table-page", XML_TABLE_PAGE ),
57 + TOKEN( "table-protection", XML_TABLE_PROTECTION ),
58 TOKEN( "table-row", XML_TABLE_ROW ),
59 TOKEN( "table-row-group", XML_TABLE_ROW_GROUP ),
60 TOKEN( "table-rows", XML_TABLE_ROWS ),