[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/doc/docredln.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d86f180cd2612d16ef5e7411af1e29ce19a542e1
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Sep 12 14:59:20 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Sep 14 13:04:49 2018 +0200

    lok: Avoid crash when inserting a table in a redline.
    
    Steps to reproduce:
    
    * turn on changetracking
    * write few characters
    * insert table
    * move the cursor behind the table and type
    * crash
    
    Change-Id: Icd7b64d2fe594c2b87c9d3d7fa48a957755cbc3b
    Reviewed-on: https://gerrit.libreoffice.org/60390
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 43197a3097d2939c30fd9f242ae52b03bf29f240)
    Reviewed-on: https://gerrit.libreoffice.org/60402

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 940907d7f3a2..1b407f46e6d9 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -405,7 +405,9 @@ void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, SwRangeRe
         {
             for(SwNodeIndex nIdx = pStartPos->nNode; nIdx <= pEndPos->nNode; ++nIdx)
             {
-                pSh->InvalidateWindows( nIdx.GetNode().GetContentNode()->FindLayoutRect() );
+                SwContentNode* pContentNode = nIdx.GetNode().GetContentNode();
+                if (pContentNode)
+                    pSh->InvalidateWindows(pContentNode->FindLayoutRect());
             }
         }
     }