[Libreoffice-commits] core.git: sw/source

[Ashod Nakashian (via logerrit)]

 sw/source/uibase/uiview/viewdraw.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 04bea205b63e964f8b3817564e54840bc8912f3e
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Sat Mar 21 11:48:40 2020 -0400
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Tue Mar 24 01:36:44 2020 +0100

    sw: check for null SdrObject before accessing
    
    Change-Id: I30f1cc658450982232feea10dbe9c5bfefe07d91
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90896
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    (cherry picked from commit 8ed4ac6152c96280616a784b47c4f75df147501a)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90946
    Tested-by: Jenkins

diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx
index 548d7eb86ce0..281e2d09553c 100644
--- a/sw/source/uibase/uiview/viewdraw.cxx
+++ b/sw/source/uibase/uiview/viewdraw.cxx
@@ -658,6 +658,8 @@ bool SwView::AreOnlyFormsSelected() const
         {
             // Except controls, are still normal draw objects selected?
             SdrObject *pSdrObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
+            if (!pSdrObj)
+                continue;
 
             if (!HasOnlyObj(pSdrObj, SdrInventor::FmForm))
             {