diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-06-26 13:07:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-06-30 15:42:32 +0200 |
| commit | dead5cae834e78cacee2275c2d1ca60dac51dd7c (patch) | |
| tree | 9d0e61beab13d14f978d1b3d17b4c6adecad26b5 /sfx2 | |
| parent | 8a6935f8cf3f2e4cac8d9463f2bf05c912e9cf98 (diff) | |
tdf#128502: Fix (haha) for a crash with multiple docs open in the iOS app
Just a band-aid to avoid a crash. The LibreOfficeKit-related code
would need a thorough re-factoring to properly be prepared for
multiple open documents.
Change-Id: I8c31e2badd747f3086526f89638fa495f4dcf295
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97205
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97409
Tested-by: Jenkins
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/lokhelper.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index d8f36c28acc9..80d029f1d8ca 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -430,7 +430,10 @@ void SfxLokHelper::notifyDocumentSizeChangedAllViews(vcl::ITiledRenderable* pDoc SfxViewShell* pViewShell = SfxViewShell::GetFirst(); while (pViewShell) { - if (pViewShell->GetDocId() == pCurrentViewShell-> GetDocId()) + // FIXME: What if SfxViewShell::Current() returned null? + // Should we then do this for all views of all open documents + // or not? + if (pCurrentViewShell == nullptr || pViewShell->GetDocId() == pCurrentViewShell-> GetDocId()) SfxLokHelper::notifyDocumentSizeChanged(pViewShell, "", pDoc, bInvalidateAll); pViewShell = SfxViewShell::GetNext(*pViewShell); } |