strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#146140 sw DOCX import: fix moveFrom regression with broken text content

Browse source 
(Also a small clean-up: increase the character limit for tracked text
moving detection: Only 2 or more (non-whitespace) character deletions
are checked for it, because single characters are often typos or some
control-like characters, e.g. soft hyphen, not real text movings.)

Details of the regression: commit d32d9a2b3c
"tdf#123460 DOCX track changes: moveFrom completely" fixed
the missing redline import of the end of the moved paragraphs,
but paragraph end was imported as w:del, not w:moveFrom explicitly.
From commit f51fa75344
"tdf#145718 sw, DOCX import: complete tracked text moving"
this resulted two deletions (a moved one and a plain one) instead of
the previous single one.

Moreover, exporting these double deletions at the same position to
ODT, raised a back-compatibility issue with broken text content, see
tdf#107292 (solved recently, but not in older LibreOffice versions).

Removing the explicit w:del code path in writerfilter, it solved
the regression from commit f51fa75344
"tdf#145718 sw, DOCX import: complete tracked text moving".

See also commit 9e1e88ad5c
"tdf#145720 DOCX export: fix loss of tracked moving".

Change-Id: I15bfc83b87dd42a762ff84edf5bae765fe02a5ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126631
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
This commit is contained in:
László Németh 2021-12-10 10:37:33 +01:00
parent b9e1d9fac9
commit 692bc46b25
4 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sw/qa/extras/layout/layout2.cxx
View file

@ -337,7 +337,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testRedlineMovingDOCX)
SwEditShell* const pEditShell(pDoc->GetEditShell());
// This was 2 (moveFrom and moveTo joined other redlines)
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(6), pEditShell->GetRedlineCount());
CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(5), pEditShell->GetRedlineCount());
// Dump the rendering of the first page as an XML file.
std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();

33
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
View file

@ -766,10 +766,37 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123460, "tdf123460.docx")
CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 2), "RedlineType"));
CPPUNIT_ASSERT_EQUAL(OUString("Delete"),getProperty<OUString>(getRun(getParagraph(2), 2), "RedlineType"));
CPPUNIT_ASSERT_EQUAL(true, getRun( getParagraph( 2 ), 3 )->getString().endsWith("tellus."));
CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 4), "Bookmark"));
// deleted paragraph mark at the end of the second paragraph
CPPUNIT_ASSERT(hasProperty(getRun(getParagraph(2), 5), "RedlineType"));
CPPUNIT_ASSERT_EQUAL(OUString("Delete"),getProperty<OUString>(getRun(getParagraph(2), 5), "RedlineType"));
CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 2 ), 6 )->getString());
if (mbExported)
{
// there is no run after the MoveBookmark
bool bCaught = false;
try
{
getRun( getParagraph( 2 ), 5 );
}
catch (container::NoSuchElementException&)
{
bCaught = true;
}
CPPUNIT_ASSERT_EQUAL(true, bCaught);
}
}
CPPUNIT_TEST_FIXTURE(Test, testTdf146140)
{
loadAndSave("tdf123460.docx");
CPPUNIT_ASSERT_EQUAL(1, getPages());
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
CPPUNIT_ASSERT(pXmlDoc);
// This was 1 (put end of paragraph of the previous moveFrom into a w:del,
// resulting double deletions at the same position, which is an
// ODT back-compatibility issue described in tdf#107292)
assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:rPr/w:del", 0);
// This was 0
assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:rPr/w:moveFrom", 1);
}
//tdf#125298: fix charlimit restrictions in bookmarknames and field references if they contain non-ascii characters

2
sw/source/core/doc/docredln.cxx
View file

@ -802,7 +802,7 @@ bool SwRedlineTable::isMoved( size_type rPos ) const
}
const OUString sTrimmed = pPaM->GetText().trim();
if ( sTrimmed.isEmpty() )
if ( sTrimmed.getLength() < 2 )
{
if ( bDeletePaM )
delete pPaM;

1
writerfilter/source/dmapper/DomainMapper_Impl.cxx
View file

@ -3119,7 +3119,6 @@ void DomainMapper_Impl::CheckParaMarkerRedline( uno::Reference< text::XTextRange
else if ( m_pParaMarkerRedlineMoveFrom )
{
// terminating moveFrom redline removes also the paragraph mark
m_pParaMarkerRedlineMoveFrom->m_nToken = XML_del;
CreateRedline( xRange, m_pParaMarkerRedlineMoveFrom );
}
if ( m_pParaMarkerRedlineMoveFrom )