sc/source/core/tool/interpr1.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
New commits: commit 69def929aa5b07e5a67279d5da20001c844fdf06 Author: Eike Rathke <[email protected]> Date: Tue Mar 14 21:13:06 2017 +0100 properly align the confusing braces Change-Id: Idd02e2eace5313ae419bfe99e3ad34e67e1c970b diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index d5fb4dc..96fee0f 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -643,12 +643,12 @@ bool ScInterpreter::JumpMatrix( short nStackLevel ) aRange.aEnd.Col() != aRange.aStart.Col()) || (nRow > static_cast<sal_uLong>(aRange.aEnd.Row()) && aRange.aEnd.Row() != aRange.aStart.Row())) - { + { fVal = CreateDoubleError( FormulaError::NotAvailable ); pJumpMatrix->PutResultDouble( fVal, nC, nR ); - } - else - { + } + else + { // Replicate column and/or row of a vector if it is // one. Note that this could be a range reference // that in fact consists of only one cell, e.g. A1:A1 @@ -662,7 +662,7 @@ bool ScInterpreter::JumpMatrix( short nStackLevel ) if (aCell.hasEmptyValue()) pJumpMatrix->PutResultEmpty( nC, nR ); else if (aCell.hasNumeric()) - { + { double fCellVal = GetCellValue(aAdr, aCell); if ( nGlobalError != FormulaError::NONE ) { @@ -671,9 +671,9 @@ bool ScInterpreter::JumpMatrix( short nStackLevel ) nGlobalError = FormulaError::NONE; } pJumpMatrix->PutResultDouble( fCellVal, nC, nR ); - } - else - { + } + else + { svl::SharedString aStr; GetCellString(aStr, aCell); if ( nGlobalError != FormulaError::NONE ) @@ -685,7 +685,7 @@ bool ScInterpreter::JumpMatrix( short nStackLevel ) else pJumpMatrix->PutResultString(aStr, nC, nR); } - } + } SCSIZE nParmCols = aRange.aEnd.Col() - aRange.aStart.Col() + 1; SCSIZE nParmRows = aRange.aEnd.Row() - aRange.aStart.Row() + 1; lcl_AdjustJumpMatrix( pJumpMatrix, nParmCols, nParmRows ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
