From 4c5932cf06f0434a0df32203d567cab976402011 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Fri, 22 Apr 2016 18:30:29 +0200
Subject: [PATCH] join two lines that cause an annoying debugger step over
 experience

Change-Id: I50bf6710f7319f5c2ea18d8a3aa02f5c613de063
---
 formula/source/core/api/FormulaCompiler.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index baacb94422c8..31004d453973 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1062,8 +1062,7 @@ bool FormulaCompiler::GetToken()
     else
     {
         short nWasColRowName;
-        if ( pArr->nIndex
-          && pArr->pCode[ pArr->nIndex-1 ]->GetOpCode() == ocColRowName )
+        if ( pArr->nIndex > 0 && pArr->pCode[ pArr->nIndex-1 ]->GetOpCode() == ocColRowName )
              nWasColRowName = 1;
         else
              nWasColRowName = 0;
@@ -1102,8 +1101,7 @@ bool FormulaCompiler::GetToken()
         mpToken = new FormulaByteToken( ocStop );
         return false;
     }
-    if ( mpToken->GetOpCode() == ocSubTotal ||
-         mpToken->GetOpCode() == ocAggregate )
+    if ( mpToken->GetOpCode() == ocSubTotal || mpToken->GetOpCode() == ocAggregate )
         glSubTotal = true;
     else if ( mpToken->IsExternalRef() )
     {