[Libreoffice-commits] core.git: sc/source

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 29 21:24:44 UTC 2020


 sc/source/ui/unoobj/docuno.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 4c14c88cc681abab787a461a1bea502a777f37e6
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Thu Jun 25 15:39:02 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Jun 29 23:24:04 2020 +0200

    Avoid crash with multiple documents open in the iOS app
    
    Also add a FIXME. Just 'hoping' is not good enough. But yeah, much of
    this code indeeed works mostly by accident.
    
    Change-Id: Ic6bcbc10229a0b7cdd8d696794efe152fca4faea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97117
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97407
    Tested-by: Jenkins

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index c8126824a173..fc9903bb2e3c 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -502,7 +502,13 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
 {
     // There seems to be no clear way of getting the grid window for this
     // particular document, hence we need to hope we get the right window.
+    // FIXME: "hope"? Are you kidding me?
     ScViewData* pViewData = ScDocShell::GetViewData();
+
+    // FIXME
+    if (!pViewData)
+        return;
+
     ScGridWindow* pGridWindow = pViewData->GetActiveWin();
 
     // update the size of the area we are painting


More information about the Libreoffice-commits mailing list