tdf#122222: add DOCX import of resolved comments as "done"

Change-Id: Id596d18965de2d8c98853c281188fe8d749055f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114204
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 8d959dc0119f..0331d3539508 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -310,9 +310,20 @@ void OOXMLDocumentImpl::resolveEndnote(Stream & rStream,
     resolveFastSubStreamWithId(rStream, mpXNoteStream, nId);
 }
 
+void OOXMLDocumentImpl::resolveCommentsExtendedStream(Stream& rStream)
+{
+    resolveFastSubStream(rStream, OOXMLStream::COMMENTS_EXTENDED);
+}
+
 void OOXMLDocumentImpl::resolveComment(Stream & rStream,
                                        const sal_Int32 nId)
 {
+    if (!mbCommentsExtendedResolved)
+    {
+        resolveCommentsExtendedStream(rStream);
+        mbCommentsExtendedResolved = true;
+    }
+
     writerfilter::Reference<Stream>::Pointer_t pStream =
         getXNoteStream(OOXMLStream::COMMENTS, nId);