tdf#120711 fix paragraph join with change tracking

a DOC import regression caused by "tdf#119571 change
tracking: show layout changes at paragraph join"
(commit 1bbbe57d)

Change-Id: Id9c1efd4f4133a5b1860f33182312f95f5459da0
Reviewed-on: https://gerrit.libreoffice.org/63680
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 836cbf36)
Reviewed-on: https://gerrit.libreoffice.org/63699

sw/qa/extras/ww8export/ww8export3.cxx

@@ -158,6 +158,13 @@ DECLARE_WW8EXPORT_TEST(testTdf94009_zeroPgMargin, "tdf94009_zeroPgMargin.odt")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(defaultStyle, "TopMargin"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf120711_joinedParagraphWithChangeTracking, "tdf120711.doc")
+{
+    sal_Int16   numFormat = getNumberingTypeOfParagraph(5);
+    // last paragraph is not a list item
+    CPPUNIT_ASSERT(style::NumberingType::CHAR_SPECIAL != numFormat);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/core/doc/DocumentRedlineManager.cxx

@@ -1835,7 +1835,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* pNewRedl, bool const bCall
                     if (pDelNode != nullptr && pTextNode != nullptr && pDelNode != pTextNode)
                         pTextNode->CopyCollFormat( *pDelNode );
                 }
-                else
+                else if ( bCallDelete && nsRedlineType_t::REDLINE_DELETE == pNewRedl->GetType() )
                 {
                     // tdf#119571 update the style of the joined paragraph
                     // after a partially deleted paragraph to show its correct style