[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Nov 17 16:45:48 UTC 2018


 sc/source/core/data/formulacell.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 725fb6c3061ddca4f7c2cb5b334708e62512cca3
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri Oct 12 14:12:13 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 17 17:45:28 2018 +0100

    don't access deleted cells
    
    This copy&pasted code that got fixed in 2926c9e40e17, so fix it as well.
    
    Change-Id: I0a038b57a428640dae8cdf17f33a2eab50b0187c
    Reviewed-on: https://gerrit.libreoffice.org/63177
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit f9026deba0581759146205237eb739f37463ba47)
    Reviewed-on: https://gerrit.libreoffice.org/63378
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index b7465341b15e..b43e908352ed 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4259,6 +4259,8 @@ struct ScDependantsCalculator
             case svSingleRef:
                 {
                     ScSingleRefData aRef = *p->GetSingleRef(); // =Sheet1!A1
+                    if( aRef.IsDeleted())
+                        return false;
                     ScAddress aRefPos = aRef.toAbs(mrPos);
 
                     if (!mrDoc.TableExists(aRefPos.Tab()))
@@ -4297,6 +4299,8 @@ struct ScDependantsCalculator
             case svDoubleRef:
                 {
                     ScComplexRefData aRef = *p->GetDoubleRef();
+                    if( aRef.IsDeleted())
+                        return false;
                     ScRange aAbs = aRef.toAbs(mrPos);
 
                     // Multiple sheet


More information about the Libreoffice-commits mailing list