[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

Mike Kaganski mike.kaganski at collabora.com
Sat Oct 24 10:12:01 PDT 2015


 sc/source/ui/docshell/docsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a00b977b617bdd9ef263067e95d26c3953c575c
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Sat Oct 24 19:03:33 2015 +1000

    tdf#95220: Check if DrawingLayer is not nullptr
    
    bool ScDocShell::isTiledRendering() const crashed without this check
    
    Change-Id: Idb7ace05eb1aa37cbc3d956503c046b0e9b9d0e5
    Reviewed-on: https://gerrit.libreoffice.org/19570
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 4fc31c1569ba1dc0e2e3aaf9eb8f0747776daa04)
    Reviewed-on: https://gerrit.libreoffice.org/19579

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ad3b6bf..a93aea4 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3185,7 +3185,7 @@ void ScDocShell::libreOfficeKitCallback(int nType, const char* pPayload) const
 
 bool ScDocShell::isTiledRendering() const
 {
-    return aDocument.GetDrawLayer()->isTiledRendering();
+    return aDocument.GetDrawLayer() && aDocument.GetDrawLayer()->isTiledRendering();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list