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

[Noel Grandin (via logerrit)]

 sc/source/core/tool/jumpmatrix.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 347912f6829990983dba8851e57a36ab96fa4f83
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Jun 5 15:04:41 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Jun 11 08:42:59 2020 +0200

    initialise ScMatrix once instead of twice
    
    initialise the mdds matrix inside ScJumpMatrix once instead of twice
    
    Change-Id: Ic6883418d965a093c76ab5dbf4c8780c174f10bc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96067
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx
index f66a82abeba7..517447b3ae2d 100644
--- a/sc/source/core/tool/jumpmatrix.cxx
+++ b/sc/source/core/tool/jumpmatrix.cxx
@@ -29,7 +29,10 @@ const SCSIZE kBufferThreshold = 128;
 
 ScJumpMatrix::ScJumpMatrix( OpCode eOp, SCSIZE nColsP, SCSIZE nRowsP )
     : mvJump(nColsP * nRowsP)
-    , pMat(new ScMatrix(nColsP, nRowsP))
+    // Initialize result matrix in case of
+    // a premature end of the interpreter
+    // due to errors.
+    , pMat(new ScMatrix(nColsP, nRowsP, CreateDoubleError(FormulaError::NotAvailable)))
     , nCols(nColsP)
     , nRows(nRowsP)
     , nCurCol(0)
@@ -43,10 +46,6 @@ ScJumpMatrix::ScJumpMatrix( OpCode eOp, SCSIZE nColsP, SCSIZE nRowsP )
     , mnBufferEmptyCount(0)
     , mnBufferEmptyPathCount(0)
 {
-    // Initialize result matrix in case of
-    // a premature end of the interpreter
-    // due to errors.
-    pMat->FillDouble(CreateDoubleError(FormulaError::NotAvailable), 0, 0, nCols - 1, nRows - 1);
     /*! pJump not initialized */
 }