diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-06-19 18:39:46 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-06-20 18:08:25 +0200 |
| commit | da23e848b697a22b5cc8ea2e0dbfb38dfa0b3d66 (patch) | |
| tree | 4dab1625990dcad0b01354240b109a0fe43b4bbe /sw | |
| parent | 63872b70cb0cc48052f43ee8966ba7c37650f81a (diff) | |
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>
(cherry picked from commit edca548f865f4c19f213c1386905ec3591326461)
Reviewed-on: https://gerrit.libreoffice.org/74418
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/doccomp.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 4d40ae43ae33..3054d17940f3 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))); } |