[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

Dennis Francis (via logerrit) logerrit at kemper.freedesktop.org
Sat Jul 25 04:56:06 UTC 2020


 sc/source/ui/view/viewdata.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 46068e8b1eb005dc0503e2f4b028c2d59afd9a29
Author:     Dennis Francis <dennis.francis at collabora.com>
AuthorDate: Sat Jul 25 09:28:55 2020 +0530
Commit:     Dennis Francis <dennis.francis at collabora.com>
CommitDate: Sat Jul 25 06:55:30 2020 +0200

    lok-freezepanes: allow empty tables
    
    Tables can be empty/not populated during import, bail out in such cases.
    
    Change-Id: Idfefdc153215ff5150aa2040858349ed9f0198a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99415
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Dennis Francis <dennis.francis at collabora.com>

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 8fd1d557c441..dca6a35069c2 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -4149,7 +4149,8 @@ void ScViewData::DeriveLOKFreezeIfNeeded(SCTAB nForTab)
     }
 
     ScViewDataTable* pViewTable = maTabData[nForTab].get();
-    assert(pViewTable);
+    if (!pViewTable)
+        return;
 
     bool bConvertToFreezeX = false;
     bool bConvertToFreezeY = false;


More information about the Libreoffice-commits mailing list