[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/doccomp.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit da23e848b697a22b5cc8ea2e0dbfb38dfa0b3d66
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Jun 19 18:39:46 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Jun 20 18:08:25 2019 +0200

    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 at cib.de>
    (cherry picked from commit edca548f865f4c19f213c1386905ec3591326461)
    Reviewed-on: https://gerrit.libreoffice.org/74418

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)));
             }