[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source
Julien Nabet (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 9 10:22:31 UTC 2019
sd/source/ui/docshell/docshel4.cxx | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 30db36c3afcd796fe15a06869cd43ef74c3ffc36
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Tue Oct 8 22:47:01 2019 +0200
Commit: Xisco FaulĂ <xiscofauli at libreoffice.org>
CommitDate: Wed Oct 9 12:21:35 2019 +0200
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
Change-Id: Id9355958b0c4a56215ff98f0e5be13a3074ce45f
Reviewed-on: https://gerrit.libreoffice.org/80500
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
(cherry picked from commit 1dc4c8266d45eb2f5c3de303eaa9233e3b52f058)
Reviewed-on: https://gerrit.libreoffice.org/80506
Reviewed-by: Xisco FaulĂ <xiscofauli at libreoffice.org>
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index d9b9ff6e8e42..e261a6e0775a 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -819,10 +819,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)
{
More information about the Libreoffice-commits
mailing list