[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/qa sw/source

[Libreoffice Gerrit user]

 sw/qa/extras/ww8export/data/tdf120711.doc     |binary
 sw/qa/extras/ww8export/ww8export3.cxx         |    7 +++++++
 sw/source/core/doc/DocumentRedlineManager.cxx |    2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 173069a1f6ac060a06f04908a94a1a8420461795
Author:     László Németh <nemeth at numbertext.org>
AuthorDate: Tue Nov 20 22:36:58 2018 +0100
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Wed Nov 21 12:53:09 2018 +0100

    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 1bbbe57dfc0b43d6b5444798d77dcdf5e4e76e49)
    
    Change-Id: Id9c1efd4f4133a5b1860f33182312f95f5459da0
    Reviewed-on: https://gerrit.libreoffice.org/63680
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 836cbf3680afd9198abf3a64be698f8fe256dd5a)
    Reviewed-on: https://gerrit.libreoffice.org/63699

diff --git a/sw/qa/extras/ww8export/data/tdf120711.doc b/sw/qa/extras/ww8export/data/tdf120711.doc
new file mode 100644
index 000000000000..90e7c05cec0a
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf120711.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx
index f732bf990c25..14293e2ba5df 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/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: */
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 036e33e43853..4ce414043270 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/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