diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-13 09:06:52 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-04-20 15:02:10 +0200 |
| commit | 4fc84b0ee4e696a1010b1ba4b8bcf7ed14454569 (patch) | |
| tree | f8cfd08a8186c84733cd85c542a79ea5900cfb87 /oox | |
| parent | Fix early return in ScInputWindow::setPosSizePixel (diff) | |
| download | core-4fc84b0ee4e696a1010b1ba4b8bcf7ed14454569.tar.gz core-4fc84b0ee4e696a1010b1ba4b8bcf7ed14454569.zip | |
tdf#122222: add DOCX export of resolved comments as "done"
Since implementation of tdf#119228, Writer comments may have
"Resolved" state, which is the equivalent of Word's internal
"done" flag.
This relies on [MS-DOCX] extensions available since Word 2013.
DOCX import will be implemented in a follow-up commit.
[MS-DOCX]: https://docs.microsoft.com/en-us/openspecs/office_standards/ms-docx
Change-Id: I3be1e8a096bdec41c8268974fe81328480eb0704
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114023
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114328
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/token/namespaces-strict.txt | 1 | ||||
| -rw-r--r-- | oox/source/token/namespaces.txt | 1 | ||||
| -rw-r--r-- | oox/source/token/relationship.inc | 1 | ||||
| -rw-r--r-- | oox/source/token/tokens.txt | 5 |
4 files changed, 8 insertions, 0 deletions
diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt index d6990e5bdf91..36841732372e 100644 --- a/oox/source/token/namespaces-strict.txt +++ b/oox/source/token/namespaces-strict.txt @@ -84,6 +84,7 @@ p14 http://schemas.microsoft.com/office/powerpoint/2010/main # MSO 2012/2013 extensions --------------------------------------------------------- +w15 http://schemas.microsoft.com/office/word/2012/wordml p15 http://schemas.microsoft.com/office/powerpoint/2012/main x12ac http://schemas.microsoft.com/office/spreadsheetml/2011/1/ac diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt index 604541129469..20d283415069 100644 --- a/oox/source/token/namespaces.txt +++ b/oox/source/token/namespaces.txt @@ -84,6 +84,7 @@ p14 http://schemas.microsoft.com/office/powerpoint/2010/main # MSO 2012/2013 extensions --------------------------------------------------------- +w15 http://schemas.microsoft.com/office/word/2012/wordml p15 http://schemas.microsoft.com/office/powerpoint/2012/main x12ac http://schemas.microsoft.com/office/spreadsheetml/2011/1/ac diff --git a/oox/source/token/relationship.inc b/oox/source/token/relationship.inc index 2b973ded1653..31d46cdd7d71 100644 --- a/oox/source/token/relationship.inc +++ b/oox/source/token/relationship.inc @@ -2,6 +2,7 @@ {Relationship::CHART, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"}, {Relationship::COMMENTS, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"}, {Relationship::COMMENTAUTHORS, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors"}, +{Relationship::COMMENTSEXTENDED, "http://schemas.microsoft.com/office/2011/relationships/commentsExtended"}, {Relationship::CONTROL, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/control"}, {Relationship::CTRLPROP, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/ctrlProp"}, {Relationship::CUSTOMXML, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml"}, diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index 3929d8c93808..9f7b815e53c2 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -1314,12 +1314,14 @@ comma command commandType comment +commentEx commentList commentPr commentRangeEnd commentRangeStart commentReference comments +commentsEx comp compact compactData @@ -1901,6 +1903,7 @@ doNotValidateAgainstSchema doNotVertAlignCellWithSp doNotVertAlignInTxbx doNotWrapTextWithPunct +done doc docDefaults docEnd @@ -3850,6 +3853,7 @@ parTrans parTransId parTxLTRAlign parTxRTLAlign +paraId paragraph parallel parallelogram @@ -5672,6 +5676,7 @@ vt w w10 w14 +w15 wAfter wArH wBefore |