[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/tools/PreviewRenderer.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6670ae80580a5f80d6042b7f9d49308862472c90
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu May 9 15:22:21 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu May 9 22:42:26 2019 +0200

    Resolves: tdf#124927 crash on multiple drawing shapes in animation dialog
    
    since...
    
    SOSAW080: Added first bunch of basic changes to helpers
    commit dfefe448c41921f2f1e54d3f69b8b9e89031d055
    Date:   Thu Mar 1 15:54:32 2018 +0100
    
    Change-Id: I9feba16b5efdbec5c817bebf2772e2f2882bdfe9
    Reviewed-on: https://gerrit.libreoffice.org/72055
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins

diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index c12930b10ece..44dceffde481 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -199,13 +199,16 @@ bool PreviewRenderer::Initialize (
     const Size& rPixelSize,
     const bool bObeyHighContrastMode)
 {
-    if (pPage == nullptr)
+    if (!pPage)
         return false;
 
     SetupOutputSize(*pPage, rPixelSize);
     SdDrawDocument& rDocument(static_cast< SdDrawDocument& >(pPage->getSdrModelFromSdrPage()));
     DrawDocShell* pDocShell = rDocument.GetDocSh();
 
+    if (!pDocShell)
+        return false;
+
     // Create view
     ProvideView (pDocShell);
     if (mpView == nullptr)