sw/qa/extras/layout/data/tdf149710.fodt | 31 +++++++++++++++++++
sw/qa/extras/layout/layout2.cxx | 42 ++++++++++++++++++++++++++
sw/source/core/doc/DocumentRedlineManager.cxx | 12 +++++++
3 files changed, 85 insertions(+)
New commits:
commit 4430bf8f97b1438252dc494cae89863d24469d2b
Author: László Németh <nem...@numbertext.org>
AuthorDate: Fri Jun 24 11:21:46 2022 +0200
Commit: László Németh <nem...@numbertext.org>
CommitDate: Fri Jun 24 17:32:24 2022 +0200
tdf#149710 sw_redlinenum: update numbering at deletion
in Show Changes mode.
Follow-up to commit 2413f213625253a9c2b1787b3b9fe859d724a9bd
"tdf#115523 sw_redlinenum: show correct, also original numbering".
Change-Id: Iebf54775f3850e668ac5b12ecbd9f010b4e93ee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136363
Tested-by: Jenkins
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/sw/qa/extras/layout/data/tdf149710.fodt
b/sw/qa/extras/layout/data/tdf149710.fodt
new file mode 100644
index 000000000000..c936b9f9bcef
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf149710.fodt
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:config="urn:oas
is:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:formx="urn:openoffice:names:
experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:automatic-styles>
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard" style:list-style-name="L1">
+ <style:text-properties officeooo:rsid="001fa9e2"
officeooo:paragraph-rsid="001fa9e2"/>
+ </style:style>
+ <text:list-style style:name="L1">
+ <text:list-level-style-number text:level="1"
text:style-name="Numbering_20_Symbols" style:num-suffix="."
style:num-format="1">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"
text:list-tab-stop-position="1.27cm" fo:text-indent="-0.635cm"
fo:margin-left="1.27cm"/>
+ </style:list-level-properties>
+ </text:list-level-style-number>
+ </text:list-style>
+ </office:automatic-styles>
+ <office:body>
+ <office:text>
+ <text:list xml:id="list2745637611" text:style-name="L1">
+ <text:list-item>
+ <text:p text:style-name="P2">Item</text:p>
+ </text:list-item>
+ <text:list-item>
+ <text:p text:style-name="P2">Item</text:p>
+ </text:list-item>
+ <text:list-item>
+ <text:p text:style-name="P2">Item</text:p>
+ </text:list-item>
+ </text:list>
+ </office:text>
+ </office:body>
+</office:document>
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 57e06f05553e..66941abc4269 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -332,6 +332,48 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testRedlineNumbering)
assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[5]/text",
"2.[3.] ");
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf149710_RedlineNumberingEditing)
+{
+ SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf149710.fodt");
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+
+ // Show Changes
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+ SwRootFrame* pLayout(pWrtShell->GetLayout());
+ CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
+
+ // delete the paragraph mark of the first list item with change tracking
+ dispatchCommand(mxComponent, ".uno:GoToEndOfLine", {});
+ dispatchCommand(mxComponent, ".uno:TrackChanges", {});
+ dispatchCommand(mxComponent, ".uno:Delete", {});
+
+ // Dump the rendering of the first page as an XML file.
+ SwDocShell* pShell = pDoc->GetDocShell();
+ std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+ MetafileXmlDump dumper;
+
+ xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+ CPPUNIT_ASSERT(pXmlDoc);
+
+ // Show the correct and the original line numbering instead of counting
+ // the deleted list items in Show Changes mode, as part of the list
+ // This was "1."
+ assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[1]/text",
"[1.] ");
+ // This was "2." (deleted text node, now its text content is part of the
first list item)
+ assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[3]/text",
"1.[2.] ");
+ // This was "3." (now it's the second list item)
+ assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[5]/text",
"2.[3.] ");
+
+ // remove the tracked deletion, and check the layout again
+ pWrtShell->Undo();
+ xMetaFile = pShell->GetPreviewMetaFile();
+ pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+ assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[1]/text",
"1.");
+ assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[3]/text",
"2.");
+ assertXPathContent(pXmlDoc, "/metafile/push/push/push/textarray[5]/text",
"3.");
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testRedlineNumberInFootnote)
{
SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf85610.fodt");
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 8a9a70ae2bb9..b215170ee36f 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -187,6 +187,12 @@ void UpdateFramesForAddDeleteRedline(SwDoc & rDoc, SwPaM
const& rPam)
SwTextNode * pNode(pStartNode);
do
{
+ // deleted text node: remove it from "hidden" list
+ // to update numbering in Show Changes mode
+ SwPosition aPos( *pNode, pNode->Len() );
+ if ( pNode->GetNumRule() && aPos < *rPam.End() )
+ pNode->RemoveFromListRLHidden();
+
std::vector<SwTextFrame*> frames;
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti>
aIter(*pNode);
for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame =
aIter.Next())
@@ -284,6 +290,12 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc,
SwPaM const& rPam)
SwTextNode * pNode(pStartNode);
do
{
+ // undeleted text node: add it to the "hidden" list
+ // to update numbering in Show Changes mode
+ SwPosition aPos( *pNode, pNode->Len() );
+ if ( pNode->GetNumRule() && aPos < *rPam.End() )
+ pNode->AddToListRLHidden();
+
std::vector<SwTextFrame*> frames;
SwIterator<SwTextFrame, SwTextNode, sw::IteratorMode::UnwrapMulti>
aIter(*pNode);
for (SwTextFrame * pFrame = aIter.First(); pFrame; pFrame =
aIter.Next())
