| commit | de572b2973ebddd8e368e8441bb2831be893cc44 | [log] |
|---|---|---|
| author | Michael Stahl <Michael.Stahl@cib.de> | Wed Jun 19 18:39:46 2019 +0200 |
| committer | Caolán McNamara <caolanm@redhat.com> | Tue Jun 25 17:18:31 2019 +0200 |
| tree | 3e5eda20662410bb1dec1cec900370007aaa156e | |
| parent | e7e3ceaae97688aa1894db0d2368237cf32e0346 [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/74419 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 315a43ec55895648e1c3a2a5cb7d1615099bf04c) Reviewed-on: https://gerrit.libreoffice.org/74509 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 86a8e4c..4bc7005 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))); }