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

[Caolán McNamara (via logerrit)]

 sc/source/core/data/formulacell.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee8731c8c38451326027f5ee270f8187cb4cd34d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Dec 16 11:13:36 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Dec 16 13:49:51 2019 +0100

    crashtesting: null deref on export to ods
    
    of EDRM_Data-Set_File-Formats_1-0/data-set/dbs/PICTURES.DBF
    
    Change-Id: Id501c1fe24aa42d25974cee7d35693f8d221d067
    Reviewed-on: https://gerrit.libreoffice.org/85208
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    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 5bb89a1ff421..c39b21341bd5 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1036,7 +1036,7 @@ OUString ScFormulaCell::GetFormula( sc::CompileFormulaContext& rCxt, const ScInt
     OUStringBuffer aBuf;
     if (pCode->GetCodeError() != FormulaError::NONE && !pCode->GetLen())
     {
-        ScTokenArray aCode(pContext->mpDoc);
+        ScTokenArray aCode(rCxt.getDoc());
         aCode.AddToken( FormulaErrorToken( pCode->GetCodeError()));
         ScCompiler aComp(rCxt, aPos, aCode, false, false, pContext);
         aComp.CreateStringFromTokenArray(aBuf);