sw/qa/extras/layout/layout2.cxx | 36 ++++++++++++++++++++++++++++++++++++
sw/qa/extras/uiwriter/uiwriter2.cxx | 9 ++++++++-
sw/source/core/doc/docnum.cxx | 5 ++++-
3 files changed, 48 insertions(+), 2 deletions(-)
New commits:
commit 4c982dbafdac900e233d7b68d95c9c99244defc1
Author: László Németh <nem...@numbertext.org>
AuthorDate: Fri Oct 22 16:15:39 2021 +0200
Commit: László Németh <nem...@numbertext.org>
CommitDate: Tue Oct 26 15:02:32 2021 +0200
tdf#145225 sw track changes: fix bad insert at moving
Moving up a list item over a tracked paragraph insertion
changed non-tracked text to tracked insertion.
Manual test:
- Create a 3-element list;
- switch on Record Changes and Show Changes;
- at the end of the list item 2, press Enter to insert a
new list item, and type some text:
Item 1
Item 2[
New item]
Item 3
where parenthesis shows the boundaries of the tracked
insertion;
- move up the last list item over list item 2 (the unmodified
paragraph text with a tracked paragraph insertion at the
end).
Paragraph text before the tracked paragraph insertion
changed to tracked insertion joining its tracked insertion
with the moved list item, resulting only 2 tracked changes:
Item 1
[Item 3
Item 2
New item]
[Item 3]
instead of the requested 3 changes:
Item 1
[Item 3]
Item 2[
New item]
[Item 3]
Change-Id: I4716b2d244b57cf86d7d14d972452191549f5fea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124144
Tested-by: Jenkins
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index a66baa7f4a81..9f765b1452c7 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -21,6 +21,7 @@
#include <unotxdoc.hxx>
#include <rootfrm.hxx>
#include <docsh.hxx>
+#include <wrtsh.hxx>
#include <IDocumentLayoutAccess.hxx>
#include <textboxhelper.hxx>
#include <frameformats.hxx>
@@ -329,6 +330,41 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testRedlineMoving)
assertXPath(pXmlDoc, "/metafile/push/push/push/font[@color='#008000']",
11);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2,
testTdf145225_RedlineMovingWithBadInsertion)
+{
+ SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf42748.fodt");
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+
+ // create a 3-element list without change tracking
+ // (because the fixed problem depends on the own changes)
+ SwEditShell* const pEditShell(pDoc->GetEditShell());
+ pEditShell->RejectRedline(0);
+ pEditShell->AcceptRedline(0);
+ CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(0),
pEditShell->GetRedlineCount());
+
+ // Show Changes
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+ SwRootFrame* pLayout(pWrtShell->GetLayout());
+ CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
+
+ // insert a tracked paragraph break in middle of the second list item,
i.e. split it
+ dispatchCommand(mxComponent, ".uno:GoToStartOfDoc", {});
+ dispatchCommand(mxComponent, ".uno:TrackChanges", {});
+ pWrtShell->Down(false, 1);
+ pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1,
/*bBasicCall=*/false);
+ pWrtShell->SplitNode(false);
+ CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(1),
pEditShell->GetRedlineCount());
+
+ // move up the last list item over the paragraph split
+ dispatchCommand(mxComponent, ".uno:GoToEndOfDoc", {});
+ dispatchCommand(mxComponent, ".uno:MoveUp", {});
+ dispatchCommand(mxComponent, ".uno:MoveUp", {});
+ // This was 2 (the tracked paragraph break joined with the moved list item,
+ // setting the not changed text of the second list item to tracked
insertion)
+ CPPUNIT_ASSERT_EQUAL(static_cast<SwRedlineTable::size_type>(3),
pEditShell->GetRedlineCount());
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf125300)
{
SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf125300.docx");
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index e64abd60658a..41dd0ff9231d 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -949,7 +949,14 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2,
testTdf145066_bad_paragraph_deletion)
dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {});
// This was 2 (bad deletion of the first paragraph)
- CPPUNIT_ASSERT_EQUAL(3, getParagraphs());
+ // TODO fix unnecessary insertion of a new list item at the end of the
document
+ CPPUNIT_ASSERT(getParagraphs() >= 3);
+
+ SwXTextDocument* pTextDoc =
dynamic_cast<SwXTextDocument*>(mxComponent.get());
+ // This was "Loremdolsit\namet.\n" (bad deletion of "m\n" at the end of
item 1)
+ CPPUNIT_ASSERT_EQUAL(OUString("Loremm" SAL_NEWLINE_STRING "dolsit"
SAL_NEWLINE_STRING
+ "amet." SAL_NEWLINE_STRING),
+ pTextDoc->getText()->getString());
}
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf54819)
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 34bc1474d734..c496fa9db4dd 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2116,7 +2116,10 @@ bool SwDoc::MoveParagraphImpl(SwPaM& rPam, SwNodeOffset
const nOffset,
}
if( pOwnRedl &&
- ( pRStt->nNode > aIdx || aIdx > pREnd->nNode ))
+ ( pRStt->nNode > aIdx || aIdx > pREnd->nNode ||
+ // pOwnRedl doesn't start at the beginning of a node, so
it's not
+ // possible to resize it to contain the line moved before
it
+ ( pRStt->nNode == aIdx && pRStt->nContent.GetIndex() > 0 )
) )
{
// it's not in itself, so don't move it
pOwnRedl = nullptr;
