sd/source/ui/dlg/sdtreelb.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 2f043f2d5b7b7ccd4790c9125ff56254313c1a84
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jan 11 11:15:55 2021 +0000
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Jan 12 11:08:48 2021 +0100
rhbz#1902708 null deref
Change-Id: I718ac8a59e5cb18c840e458de8e9f877c6449fd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109005
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 8144a1dd4155..7ee164ac09d3 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -921,7 +921,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);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
