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

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/compiler.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3e6f94da60ca9de99ca0f805a36ab2473cf30e78
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 13 15:21:06 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Sep 13 21:18:08 2020 +0200

    pDoc cannot be null, so drop check for that
    
    Change-Id: I5c295e2f384f09fae9e504c726ccf1bd91ca3264
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102586
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 333806049b3c..d0df03f30485 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -1812,7 +1812,7 @@ ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos,
     : FormulaCompiler(rArr, bComputeII, bMatrixFlag),
     pDoc(&rCxt.getDoc()),
     aPos(rPos),
-    mpFormatter(pContext? pContext->GetFormatTable() : pDoc->GetFormatTable()),
+    mpFormatter(pContext ? pContext->GetFormatTable() : pDoc->GetFormatTable()),
     mpInterpreterContext(pContext),
     mnCurrentSheetTab(-1),
     mnCurrentSheetEndPos(0),
@@ -1857,7 +1857,7 @@ ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos,
     : FormulaCompiler(bComputeII, bMatrixFlag),
     pDoc(&rCxt.getDoc()),
     aPos(rPos),
-    mpFormatter(pContext ? pContext->GetFormatTable() : pDoc ? pDoc->GetFormatTable() : nullptr),
+    mpFormatter(pContext ? pContext->GetFormatTable() : pDoc->GetFormatTable()),
     mpInterpreterContext(pContext),
     mnCurrentSheetTab(-1),
     mnCurrentSheetEndPos(0),