diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-01-11 11:15:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-12 14:39:41 +0100 |
| commit | 9b0c4607d0cf2103c096b9571af184ac7a6cc11d (patch) | |
| tree | ada6bd10a9bab110fa52e6c58e654b653d9fae51 /sd/source | |
| parent | 7635a475130a0e9e3b0dded853348659d07a00d7 (diff) | |
rhbz#1902708 null deref
Change-Id: I718ac8a59e5cb18c840e458de8e9f877c6449fd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109087
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index fadcd450b170..98542f75cdfa 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -945,7 +945,9 @@ void SdPageObjsTLV::SetSdNavigator(SdNavigatorWin* pNavigator) void SdPageObjsTLV::SetViewFrame(const SfxViewFrame* pViewFrame) { sd::ViewShellBase* pBase = sd::ViewShellBase::GetViewShellBase(pViewFrame); - const css::uno::Reference< css::frame::XFrame > xFrame = pBase->GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(); + std::shared_ptr<sd::ViewShell> xViewShell = pBase->GetMainViewShell(); + SAL_WARN_IF(!xViewShell, "sd", "null pBaseViewFrame"); + const css::uno::Reference< css::frame::XFrame > xFrame = xViewShell ? xViewShell->GetViewFrame()->GetFrame().GetFrameInterface() : nullptr; m_xAccel->init(::comphelper::getProcessComponentContext(), xFrame); } |