commit e5d8dc12fcf64fbbefadefbe863c772dc9134d38
author Caolán McNamara <caolanm@redhat.com> Thu Jun 02 14:11:30 2016 +0100
committer Caolán McNamara <caolanm@redhat.com> Thu Jun 02 14:11:30 2016 +0100
tree 3d43d7cfbccf4a2e9dd400875e5b786da7751339
parent ede822998331d75f1a17d86d609cb732d880accd

Resolves: tdf#100191 crash: switch to Display Mode: Notes via toolbar

Change-Id: I65f5f68433940fa0b50ad951fbb96085178a42d9

sd/source/ui/sidebar/SlideBackground.cxx

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 73da0e7..28e9bd9 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -349,7 +349,8 @@ void SlideBackground::populateMasterSlideDropdown()

void SlideBackground::updateMasterSlideSelection()
{
    SdPage* pPage = mrBase.GetMainViewShell().get()->getCurrentPage();
    ViewShell* pMainViewShell = mrBase.GetMainViewShell().get();
    SdPage* pPage = pMainViewShell ? pMainViewShell->getCurrentPage() : nullptr;
    if (pPage != nullptr && pPage->TRG_HasMasterPage())
    {
        SdrPage& rMasterPage (pPage->TRG_GetMasterPage());