commit edca548f865f4c19f213c1386905ec3591326461
author Michael Stahl <Michael.Stahl@cib.de> Wed Jun 19 18:39:46 2019 +0200
committer Michael Stahl <Michael.Stahl@cib.de> Thu Jun 20 10:20:41 2019 +0200
tree 6ecbec5ed97ad7d4a422138f1b5ffe38abf185b3
parent e2814bc4d3a3c8b63018e2733b1ac182adbd96e6

tdf#125660 sw_redlinehide: don't create redlines for GrfNode/OLENode

This started to assert/crash with commit
d258fc29560baa5ecae03ebc2740e11420643e27, but such redlines are really
not valid so it's a regression from commit
16916a14a2ce382aa4ff2a25f8e477108aba5a67.

Change-Id: I4c03a96a43b62a3c5321535a34c2d09b155b79c0
Reviewed-on: https://gerrit.libreoffice.org/74371
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

sw/source/core/doc/doccomp.cxx

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 4d40ae4..3054d17 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1799,6 +1799,11 @@ namespace
                    continue;
                if (!pSrcNode || !pDestNode)
                    break;
                if (pSrcIdx->GetNodes()[pSrcIdx->GetIndex() + 1]->IsNoTextNode()
                    || pDestIdx->GetNodes()[pDestIdx->GetIndex() + 1]->IsNoTextNode())
                {
                    continue; // tdf#125660 don't redline GrfNode/OLENode
                }
                aComparisons.emplace_back(CompareDataPtr(new CompareFrameFormatText(rSrcDoc, *pSrcIdx)),
                                          CompareDataPtr(new CompareFrameFormatText(rDestDoc, *pDestIdx)));
            }