sw_redlinehide: convert SwTextFrame::MakePos() which has...

... and odd LOKit notification loop that looks a bit unoptimised.

Change-Id: I9b510f1bc8c295bb9b871ce5cc6060dbd8b96bcb

1 files changed, 9 insertions, 3 deletions

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index f6cb776baf15..40ed097b1200 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -351,14 +351,20 @@ void SwTextFrame::MakePos()
     // Inform LOK clients about change in position of redlines (if any)
     if(comphelper::LibreOfficeKit::isActive())
     {
-        const SwTextNode& rTextNode = *GetTextNode();
-        const SwRedlineTable& rTable = rTextNode.getIDocumentRedlineAccess().GetRedlineTable();
+        SwTextNode const* pTextNode = GetTextNodeFirst();
+        const SwRedlineTable& rTable = pTextNode->getIDocumentRedlineAccess().GetRedlineTable();
         for (SwRedlineTable::size_type nRedlnPos = 0; nRedlnPos < rTable.size(); ++nRedlnPos)
         {
             SwRangeRedline* pRedln = rTable[nRedlnPos];
-            if (rTextNode.GetIndex() == pRedln->GetPoint()->nNode.GetNode().GetIndex())
+            if (pTextNode->GetIndex() == pRedln->GetPoint()->nNode.GetNode().GetIndex())
             {
                 pRedln->MaybeNotifyRedlinePositionModification(getFrameArea().Top());
+                if (GetMergedPara()
+                    && pRedln->GetType() == nsRedlineType_t::REDLINE_DELETE
+                    && pRedln->GetPoint()->nNode != pRedln->GetMark()->nNode)
+                {
+                    pTextNode = pRedln->End()->nNode.GetNode().GetTextNode();
+                }
             }
         }
     }