summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2019-10-08 22:47:01 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-10 08:14:41 +0200
commit10254887286aeb0df54b531a689eae387bbe1f62 (patch)
tree38841ed703e3dddc56dd840995eb87b2d166cba1
parent8b0e44c36b6ce885e25f4c98e58638ed2dffaac9 (diff)
tdf#128013: fix Crash when linking an odp file
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 <serval2412@yahoo.fr> (cherry picked from commit 1dc4c8266d45eb2f5c3de303eaa9233e3b52f058) Reviewed-on: https://gerrit.libreoffice.org/80506 Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Change-Id: Id9355958b0c4a56215ff98f0e5be13a3074ce45f Reviewed-on: https://gerrit.libreoffice.org/80539 Tested-by: Jenkins Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org> (cherry picked from commit 60f604bd06418c2a521e0b7b018c0edf7e65e9c4) Reviewed-on: https://gerrit.libreoffice.org/80563 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sd/source/ui/docshell/docshel4.cxx11
1 files 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)
{