strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

join two lines that cause an annoying debugger step over experience

Browse source 
Change-Id: I50bf6710f7319f5c2ea18d8a3aa02f5c613de063
This commit is contained in:
Eike Rathke 2016-04-22 18:30:29 +02:00
parent 5892c6b226
commit 4c5932cf06
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
formula/source/core/api/FormulaCompiler.cxx
View file

@ -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() )
{