summaryrefslogtreecommitdiffstats
path: root/nlpsolver
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-15 13:08:01 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-10-15 14:26:07 +0100
commit7c465e7f9e8b5c34a4926fb0de84de70aee8f37d (patch)
treea58e26fc48d76ce53a24bba1ac4a0feec0a8d504 /nlpsolver
parentcoverity#1326241 Dereference after null check (diff)
downloadcore-7c465e7f9e8b5c34a4926fb0de84de70aee8f37d.tar.gz
core-7c465e7f9e8b5c34a4926fb0de84de70aee8f37d.zip
coverity#1326260 Explicit null dereferenced
Change-Id: I75b9cb661a7a45304bf32395ad980f83621f4612
Diffstat (limited to 'nlpsolver')
-rw-r--r--nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
index fbb53f9b64ed..16bb7e861605 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
@@ -247,7 +247,7 @@ public abstract class BaseNLPSolver extends WeakBase
int lastSheet = -1, lastRow = -1;
for (int i = 0; i < m_variableCount; i++) {
if (lastSheet == m_variables[i].Sheet && lastRow == m_variables[i].Row &&
- currentRow.EndCol == m_variables[i].Column - 1)
+ currentRow != null && currentRow.EndCol == m_variables[i].Column - 1)
currentRow.EndCol++;
else {
currentRow = new RowInfo(m_variables[i].Sheet, m_variables[i].Row);