From 60f604bd06418c2a521e0b7b018c0edf7e65e9c4 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 8 Oct 2019 22:47:01 +0200 Subject: tdf#128013: fix Crash when linking an odp file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=154847 Regression introduced by: https://cgit.freedesktop.org/libreoffice/core/commit/?id=3c86ffd8ded628e6f2b4187948a1b1056f6a0f56 Reviewed-on: https://gerrit.libreoffice.org/80500 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 1dc4c8266d45eb2f5c3de303eaa9233e3b52f058) Reviewed-on: https://gerrit.libreoffice.org/80506 Reviewed-by: Xisco Faulí Signed-off-by: Xisco Fauli Change-Id: Id9355958b0c4a56215ff98f0e5be13a3074ce45f Reviewed-on: https://gerrit.libreoffice.org/80539 Tested-by: Jenkins Reviewed-by: Xisco Faulí --- sd/source/ui/docshell/docshel4.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 465ccf4481bb..51063a02cc57 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -836,10 +836,13 @@ void DrawDocShell::GotoBookmark(const OUString& rBookmark) pDrawViewShell->SwitchPage(nSdPgNum); } - // show page - SvxZoomItem aZoom; - aZoom.SetType( SvxZoomType::WHOLEPAGE ); - pDrawViewShell->GetDispatcher()->ExecuteList(SID_ATTR_ZOOM, SfxCallMode::ASYNCHRON, { &aZoom }); + if (pDrawViewShell->GetDispatcher()) + { + // show page + SvxZoomItem aZoom; + aZoom.SetType( SvxZoomType::WHOLEPAGE ); + pDrawViewShell->GetDispatcher()->ExecuteList(SID_ATTR_ZOOM, SfxCallMode::ASYNCHRON, { &aZoom }); + } if (pObj != nullptr) { -- cgit v1.2.3