[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Paris Oplopoios (via logerrit)]

 sw/qa/extras/ooxmlexport/data/CommentReply.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx        |    2 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f2428c21c635b142b27adf020518d9b13b3baf0e
Author:     Paris Oplopoios <paris.oplopo...@collabora.com>
AuthorDate: Wed Feb 15 03:23:07 2023 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Feb 16 08:44:42 2023 +0000

    Fix issue where comment replies would not get a para id on roundtrip
    
    Also adjusted the test file to account for this
    
    Change-Id: I34f1d9d3a77f91396dd733785eb5b7853289508a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147034
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/qa/extras/ooxmlexport/data/CommentReply.docx 
b/sw/qa/extras/ooxmlexport/data/CommentReply.docx
index 4a78d84d55e6..e3a648aa4326 100644
Binary files a/sw/qa/extras/ooxmlexport/data/CommentReply.docx and 
b/sw/qa/extras/ooxmlexport/data/CommentReply.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index 30ef1735c73f..99c0b2c9ffe7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -885,6 +885,8 @@ CPPUNIT_TEST_FIXTURE(Test, testCommentReply)
     loadAndSave("CommentReply.docx");
     xmlDocUniquePtr pXmlComm = parseExport("word/comments.xml");
     xmlDocUniquePtr pXmlCommExt = parseExport("word/commentsExtended.xml");
+    CPPUNIT_ASSERT(pXmlComm);
+    CPPUNIT_ASSERT(pXmlCommExt);
     OUString sParentId = getXPath(pXmlComm, "/w:comments/w:comment[1]/w:p[1]", 
"paraId");
     OUString sChildId = getXPath(pXmlComm, "/w:comments/w:comment[2]/w:p[1]", 
"paraId");
     OUString sChildIdEx = getXPath(pXmlCommExt, 
"/w15:commentsEx/w15:commentEx", "paraId");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f5f8f70d732c..b282742e7311 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2696,8 +2696,8 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
             {
                 m_bAnnotationResolved = item->second.bDone;
                 m_sAnnotationParent = item->second.sParaIdParent;
-                m_sAnnotationImportedParaId = sParaId;
             }
+            m_sAnnotationImportedParaId = sParaId;
         }
     }