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

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/xicontent.cxx         |    3 ++-
 sc/source/filter/xcl97/XclImpChangeTrack.cxx |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3adfa69d85fd6600ad34b683f2d99900331cf2fa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 31 12:29:06 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 31 17:31:08 2019 +0100

    crashtesting: null deref on import of fdo64646-4.xls
    
    Change-Id: Ie9d3e06a713660124148362f97f0f9dbe45f69bc
    Reviewed-on: https://gerrit.libreoffice.org/81844
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 3461652949f2..615d82ffa4e7 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -105,7 +105,7 @@ void XclImpChangeTrack::DoInsertRange( const ScRange& rRange, bool bEndOfList )
 void XclImpChangeTrack::DoDeleteRange( const ScRange& rRange )
 {
     sal_uLong nFirst, nLast;
-    pChangeTrack->AppendDeleteRange( rRange, nullptr, nFirst, nLast );
+    pChangeTrack->AppendDeleteRange( rRange,  &GetDoc() , nFirst, nLast );
     DoAcceptRejectAction( nFirst, nLast );
 }
 
commit 20bca05a8e5a07c21451e4c62064d1a5680611d9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 31 12:25:05 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 31 17:30:55 2019 +0100

    crashtesting: null deref on import of fdo48634-1.xls
    
    Change-Id: If718c39d31ae214f02cbb747f0ceafd35b297521
    Reviewed-on: https://gerrit.libreoffice.org/81843
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 3baf8a5d4292..298f612f2b1c 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -337,8 +337,9 @@ OUString XclImpHyperlink::ReadEmbeddedData( XclImpStream& rStrm )
                     // '#SheetName.A1' if possible.
                     if (nSepPos < xTextMark->getLength() - 1)
                     {
+                        ScDocument& rDoc = rRoot.GetDoc();
                         ScRange aRange;
-                        if ((aRange.ParseAny( xTextMark->copy( nSepPos + 1 ), nullptr, formula::FormulaGrammar::CONV_XL_R1C1)
+                        if ((aRange.ParseAny( xTextMark->copy( nSepPos + 1 ), &rDoc, formula::FormulaGrammar::CONV_XL_R1C1)
                                         & ScRefFlags::VALID) == ScRefFlags::ZERO)
                             xTextMark.reset( new OUString( xTextMark->replaceAt( nSepPos, 1, OUString( '.' ))));
                     }