sw/source/core/doc/docredln.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit fa74c7f7613792ff191a6d4597274078dadbe8d8
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Sun Oct 6 22:11:30 2019 +0200
Commit: Marco Cecchetti <marco.cecche...@collabora.com>
CommitDate: Fri Mar 6 10:38:10 2020 +0100
lok: change-annotations: fix not unique id and multiline changes
When a redline was splitted we ended up with 2 redlines with the same
id (note that this id is used only by lok clients).
When a redline is a multiline, the generated rectangles was wrong.
Change-Id: Iaa7599ab16f4c8939606b1da0dcddb4aac6e983f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/82010
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti <marco.cecche...@collabora.com>
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index de78e2a35000..ebdc7ee3c5ba 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -369,8 +369,8 @@ void
SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, SwRangeRe
{
SwShellCursor aCursor(pView->GetWrtShell(), *pStartPos);
aCursor.SetMark();
- aCursor.GetMark()->nNode = *pContentNd;
- aCursor.GetMark()->nContent.Assign(pContentNd,
pEndPos->nContent.GetIndex());
+ aCursor.GetMark()->nNode = pEndPos->nNode;
+ aCursor.GetMark()->nContent = pEndPos->nContent;
aCursor.FillRects();
@@ -1008,7 +1008,7 @@ SwRangeRedline::SwRangeRedline( const SwRangeRedline&
rCpy )
: SwPaM( *rCpy.GetMark(), *rCpy.GetPoint() ),
m_pRedlineData( new SwRedlineData( *rCpy.m_pRedlineData )),
m_pContentSect( nullptr ),
- m_nId( rCpy.m_nId )
+ m_nId( m_nLastId++ )
{
m_bDelLastPara = false;
m_bIsVisible = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
