| commit | 836cbf3680afd9198abf3a64be698f8fe256dd5a | [log] |
|---|---|---|
| author | László Németh <nemeth@numbertext.org> | Tue Nov 20 22:36:58 2018 +0100 |
| committer | László Németh <nemeth@numbertext.org> | Wed Nov 21 10:28:38 2018 +0100 |
| tree | 0f897432fe20d6c2840c0db79438e3d8c320363e | |
| parent | 60e6593f042e3e2869ece89cc43390b3254b3205 [diff] |
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@numbertext.org>
diff --git a/sw/qa/extras/ww8export/data/tdf120711.doc b/sw/qa/extras/ww8export/data/tdf120711.doc new file mode 100644 index 0000000..90e7c05 --- /dev/null +++ b/sw/qa/extras/ww8export/data/tdf120711.doc Binary files differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx index f732bf9..14293e2 100644 --- a/sw/qa/extras/ww8export/ww8export3.cxx +++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -158,6 +158,13 @@ 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 036e33e4..4ce4140 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1835,7 +1835,7 @@ 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