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

[Markus Mohrhard]

 sd/source/ui/sidebar/SlideBackground.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0a19e85f0c34c85f18cc9d5ade9a5ad41ed6750b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jun 15 23:34:33 2016 +0200

    SfxObjectShell::Current may return nullptr
    
    See
    http://crashreport.libreoffice.org/stats/crash_details/caa7efba-fbe8-4c58-966d-c4bc356b5a63
    
    Change-Id: Idc8b3a2e482a5423080735f46f50d415835f747d
    Reviewed-on: https://gerrit.libreoffice.org/26343
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index fd728d6..9c3274e 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -195,6 +195,9 @@ void SlideBackground::Update()
 {
     const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectEntryPos();
     SfxObjectShell* pSh = SfxObjectShell::Current();
+    if (!pSh)
+        return;
+
     switch(eXFS)
     {
         case drawing::FillStyle_NONE: