1 files changed, 11 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index fba694b5b77b..72671cb93c1e 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -310,9 +310,20 @@ void OOXMLDocumentImpl::resolveEndnote(Stream & rStream,
     resolveFastSubStreamWithId(rStream, pStream, 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);