Skip to content

C
core
Kaydet (Commit) edd4370f authored tarafından Eike Rathke's avatar Eike Rathke
Dosyalara gözat
Seçenekler

check presence of token, tdf#96426 follow-up 

Change-Id: I4c368dfd113b02d208013b4ba79dff606769a150
üst b79d2260
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
formula/source/core/api/FormulaCompiler.cxx
Dosyayı görüntüle @ edd4370f
...@@ -305,6 +305,9 @@ bool isRangeResultOpCode( OpCode eOp ) ...@@ -305,6 +305,9 @@ bool isRangeResultOpCode( OpCode eOp )
} }
/** /**
@param pToken
MUST be a valid token, caller has to ensure.
@param bRight @param bRight
If bRPN==false, bRight==false means opcodes for left side are If bRPN==false, bRight==false means opcodes for left side are
checked, bRight==true means opcodes for right side. If bRPN==true checked, bRight==true means opcodes for right side. If bRPN==true
...@@ -1200,6 +1203,7 @@ bool FormulaCompiler::GetToken() ...@@ -1200,6 +1203,7 @@ bool FormulaCompiler::GetToken()
pArr->nIndex--; // we advanced to the second ocColRowName, step back pArr->nIndex--; // we advanced to the second ocColRowName, step back
} }
else if (pSpacesToken && FormulaGrammar::isExcelSyntax( meGrammar) && else if (pSpacesToken && FormulaGrammar::isExcelSyntax( meGrammar) &&
pCurrToken && mpToken &&
isPotentialRangeType( pCurrToken.get(), false, false) && isPotentialRangeType( pCurrToken.get(), false, false) &&
isPotentialRangeType( mpToken.get(), false, true)) isPotentialRangeType( mpToken.get(), false, true))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment