diff options
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 | ||||
| -rw-r--r-- | formula/source/core/api/token.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 3829ffe562df..bd1d1f082455 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -2211,9 +2211,9 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer ) else if ( FormulaGrammar::isOOXML( meGrammar ) ) { // Scan token array for missing args and rewrite if present. - MissingConventionOOXML aConv; if (pArr->NeedsOoxmlRewrite()) { + MissingConventionOOXML aConv; pArr = pArr->RewriteMissing( aConv ); maArrIterator = FormulaTokenArrayPlainIterator( *pArr ); } diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 92f60254ec8f..37dd26979ced 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1389,12 +1389,11 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( const MissingConvention & ++nFn; // all following operations on _that_ function pCtx[ nFn ].mpFunc = aIter.PeekPrevNoSpaces(); pCtx[ nFn ].mnCurArg = 0; - OpCode eOp; if (rConv.isPODF() && pCtx[ nFn ].mpFunc && pCtx[ nFn ].mpFunc->GetOpCode() == ocAddress) pOcas[ nOcas++ ] = nFn; // entering ADDRESS() if PODF else if ((rConv.isODFF() || rConv.isOOXML()) && pCtx[ nFn ].mpFunc) { - eOp = pCtx[ nFn ].mpFunc->GetOpCode(); + OpCode eOp = pCtx[ nFn ].mpFunc->GetOpCode(); if (eOp == ocDBCount || eOp == ocDBCount2) pOcds[ nOcds++ ] = nFn; // entering DCOUNT() or DCOUNTA() if ODFF or OOXML } |