[Libreoffice-commits] core.git: 3 commits - formula/source include/formula
Eike Rathke
erack at redhat.com
Thu Nov 27 17:04:44 PST 2014
formula/source/core/api/FormulaCompiler.cxx | 17
formula/source/core/api/token.cxx | 493 +++++++++++++---------------
include/formula/tokenarray.hxx | 48 ++
3 files changed, 290 insertions(+), 268 deletions(-)
New commits:
commit 8f031861f590ba914321816657a003375d93ef5d
Author: Eike Rathke <erack at redhat.com>
Date: Fri Nov 28 02:03:06 2014 +0100
write TRUE() for 2nd IF() parameter, fdo#81596 related
Change-Id: I52d0b43b19e10bee82109b635b3b7ce4f43650a3
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index a8e9e43..a414a4b 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -1149,7 +1149,9 @@ void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const Missi
{
// Excel needs at least two parameters in IF function
pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 2nd, true()
+ pNewArr->AddOpCode( ocTrue ); // 2nd, true() as function
+ pNewArr->AddOpCode( ocOpen ); // so the result is of logical type
+ pNewArr->AddOpCode( ocClose ); // and survives roundtrip
}
break;
commit 14aabee5a73e57e26b2062b1ebf00c3f1dff1250
Author: Eike Rathke <erack at redhat.com>
Date: Fri Nov 28 01:39:24 2014 +0100
simplify RewriteMissing() and switch in Add...(), fdo#81596 related
Change-Id: If2ca37e1fda87ce56282fc2d2fc57a0784851139
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index cfdae59..0e56d0e 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1737,19 +1737,19 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
FormulaTokenArray* pSaveArr = pArr;
bool bODFF = FormulaGrammar::isODFF( meGrammar);
- MissingConventionPOF aConv( bODFF);
if (bODFF || FormulaGrammar::isPODF( meGrammar) )
{
// Scan token array for missing args and re-write if present.
- if (pArr->NeedsPofRewrite( aConv))
- pArr = pArr->RewriteMissing( false, aConv );
+ MissingConventionODF aConv( bODFF);
+ if (pArr->NeedsPodfRewrite( aConv))
+ pArr = pArr->RewriteMissing( aConv );
}
else if ( FormulaGrammar::isOOXML( meGrammar ) )
{
- // fdo#81596
// Scan token array for missing args and rewrite if present.
- if ( pArr->NeedsOOXMLRewrite() )
- pArr = pArr->RewriteMissing( true, aConv );
+ MissingConventionOOXML aConv;
+ if (pArr->NeedsOoxmlRewrite( aConv))
+ pArr = pArr->RewriteMissing( aConv );
}
// At least one character per token, plus some are references, some are
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 5e43ea0..a8e9e43 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -995,9 +995,9 @@ bool FormulaTokenArray::HasMatrixDoubleRefOps()
return false;
}
-// --- POF (plain old formula) rewrite of a token array ---------------------
+// --- Formula rewrite of a token array
-inline bool MissingConventionPOF::isRewriteNeeded( OpCode eOp ) const
+inline bool MissingConventionODF::isRewriteNeeded( OpCode eOp ) const
{
switch (eOp)
{
@@ -1009,7 +1009,62 @@ inline bool MissingConventionPOF::isRewriteNeeded( OpCode eOp ) const
return true;
case ocMissing:
case ocLog:
- return !isODFF(); // rewrite only for PODF
+ return isPODF(); // rewrite only for PODF
+ default:
+ return false;
+ }
+}
+
+/*
+ * fdo 81596
+Test status ( . : in progress , v : tested , - not applicable )
+finished:
+- ocCosecant: // for OOXML not rewritten anymore
+- ocSecant: // for OOXML not rewritten anymore
+- ocCot: // for OOXML not rewritten anymore
+- ocCosecantHyp: // for OOXML not rewritten anymore
+- ocSecantHyp: // for OOXML not rewritten anymore
+- ocCotHyp: // for OOXML not rewritten anymore
+- ocArcCot: // for OOXML not rewritten anymore
+- ocArcCotHyp: // ACOTH(x), not needed for Excel2013 and later
+- ocChose: // CHOOSE() - no rewrite needed, it seems
+v ocEuroConvert:
+v ocIf:
+v ocRound:
+v ocRoundUp:
+v ocRoundDown:
+v ocGammaDist:
+v ocPoissonDist:
+v ocNormDist:
+v ocLogNormDist:
+
+To be implemented yet:
+ ocExternal: ?
+ ocMacro: ?
+ ocIndex: INDEX() ?
+ ocFDist: // later, fdo40835
+*/
+inline bool MissingConventionOOXML::isRewriteNeeded( OpCode eOp ) const
+{
+ switch (eOp)
+ {
+ case ocIf:
+
+ case ocExternal:
+ case ocEuroConvert:
+ case ocMacro:
+
+ case ocRound:
+ case ocRoundUp:
+ case ocRoundDown:
+
+ case ocIndex:
+
+ case ocGammaDist:
+ case ocPoissonDist:
+ case ocNormDist:
+ case ocLogNormDist:
+ return true;
default:
return false;
}
@@ -1024,132 +1079,136 @@ class FormulaMissingContext
void Clear() { mpFunc = NULL; mnCurArg = 0; }
inline bool AddDefaultArg( FormulaTokenArray* pNewArr, int nArg, double f ) const;
bool AddMissingExternal( FormulaTokenArray* pNewArr ) const;
- bool AddMissingPOF( FormulaTokenArray *pNewArr, const MissingConventionPOF & rConv ) const;
- void AddMoreArgsPOF( FormulaTokenArray *pNewArr, const MissingConventionPOF & rConv ) const;
- bool AddMissingOOXML( FormulaTokenArray *pNewArr ) const;
- void AddMoreArgsOOXML( FormulaTokenArray *pNewArr ) const;
+ bool AddMissing( FormulaTokenArray *pNewArr, const MissingConvention & rConv ) const;
+ void AddMoreArgs( FormulaTokenArray *pNewArr, const MissingConvention & rConv ) const;
};
-void FormulaMissingContext::AddMoreArgsPOF( FormulaTokenArray *pNewArr, const MissingConventionPOF & rConv ) const
+void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const MissingConvention & rConv ) const
{
if ( !mpFunc )
return;
- switch (mpFunc->GetOpCode())
+ switch (rConv.getConvention())
{
- case ocGammaDist:
- if (mnCurArg == 2)
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=true()
- }
- break;
- case ocPoissonDist:
- if (mnCurArg == 1)
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 3rd, Cumulative=true()
- }
- break;
- case ocNormDist:
- if ( mnCurArg == 2 )
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=true()
- }
- break;
- case ocLogNormDist:
- if ( mnCurArg == 0 )
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 0.0 ); // 2nd, mean = 0.0
- }
- if ( mnCurArg <= 1 )
+ case MissingConvention::FORMULA_MISSING_CONVENTION_ODFF:
+ case MissingConvention::FORMULA_MISSING_CONVENTION_PODF:
{
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 3rd, standard deviation = 1.0
+ switch (mpFunc->GetOpCode())
+ {
+ case ocGammaDist:
+ if (mnCurArg == 2)
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=true()
+ }
+ break;
+ case ocPoissonDist:
+ if (mnCurArg == 1)
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 1.0 ); // 3rd, Cumulative=true()
+ }
+ break;
+ case ocNormDist:
+ if ( mnCurArg == 2 )
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=true()
+ }
+ break;
+ case ocLogNormDist:
+ if ( mnCurArg == 0 )
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 0.0 ); // 2nd, mean = 0.0
+ }
+ if ( mnCurArg <= 1 )
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 1.0 ); // 3rd, standard deviation = 1.0
+ }
+ break;
+ case ocLog:
+ if ( rConv.isPODF() && mnCurArg == 0 )
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 10.0 ); // 2nd, basis 10
+ }
+ break;
+ default:
+ break;
+ }
}
break;
- case ocLog:
- if ( !rConv.isODFF() && mnCurArg == 0 )
+ case MissingConvention::FORMULA_MISSING_CONVENTION_OOXML:
{
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 10.0 ); // 2nd, basis 10
- }
- break;
- default:
- break;
- }
-}
-
-void FormulaMissingContext::AddMoreArgsOOXML( FormulaTokenArray *pNewArr ) const
-{
- if ( !mpFunc )
- return;
+ switch (mpFunc->GetOpCode())
+ {
+ case ocIf:
+ if( mnCurArg == 0 )
+ {
+ // Excel needs at least two parameters in IF function
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 1.0 ); // 2nd, true()
+ }
+ break;
- switch (mpFunc->GetOpCode())
- {
- case ocIf:
- if( mnCurArg == 0 )
- {
- // Excel needs at least two parameters in IF function
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 2nd, true()
- }
- break;
+ case ocEuroConvert:
+ if ( mnCurArg == 2 )
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 0.0 ); // 4th, FullPrecision = false()
+ }
+ break;
- case ocEuroConvert:
- if ( mnCurArg == 2 )
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 0.0 ); // 4th, FullPrecision = false()
- }
- break;
+ case ocPoissonDist:
+ if (mnCurArg == 1)
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 1.0 ); // 3rd, Cumulative=true()
+ }
+ break;
- case ocPoissonDist:
- if (mnCurArg == 1)
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 3rd, Cumulative=true()
- }
- break;
+ case ocGammaDist:
+ case ocNormDist:
+ if (mnCurArg == 2)
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=true()
+ }
+ break;
- case ocGammaDist:
- case ocNormDist:
- if (mnCurArg == 2)
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=true()
- }
- break;
+ case ocLogNormDist:
+ if ( mnCurArg == 0 )
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 0.0 ); // 2nd, mean = 0.0
+ }
+ if ( mnCurArg <= 1 )
+ {
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 1.0 ); // 3rd, standard deviation = 1.0
+ }
+ break;
- case ocLogNormDist:
- if ( mnCurArg == 0 )
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 0.0 ); // 2nd, mean = 0.0
- }
- if ( mnCurArg <= 1 )
- {
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 1.0 ); // 3rd, standard deviation = 1.0
- }
- break;
+ case ocRound:
+ case ocRoundUp:
+ case ocRoundDown:
+ if( mnCurArg == 0 )
+ {
+ // ROUND, ROUNDUP, ROUNDDOWN functions are fixed to 2 parameters in Excel
+ pNewArr->AddOpCode( ocSep );
+ pNewArr->AddDouble( 0.0 ); // 2nd, 0.0
+ }
+ break;
- case ocRound:
- case ocRoundUp:
- case ocRoundDown:
- if( mnCurArg == 0 )
- {
- // ROUND, ROUNDUP, ROUNDDOWN functions are fixed to 2 parameters in Excel
- pNewArr->AddOpCode( ocSep );
- pNewArr->AddDouble( 0.0 ); // 2nd, 0.0
+ default:
+ break;
+ }
}
break;
-
- default:
- break;
}
+
}
inline bool FormulaMissingContext::AddDefaultArg( FormulaTokenArray* pNewArr, int nArg, double f ) const
@@ -1186,7 +1245,7 @@ bool FormulaMissingContext::AddMissingExternal( FormulaTokenArray *pNewArr ) con
return false;
}
-bool FormulaMissingContext::AddMissingPOF( FormulaTokenArray *pNewArr, const MissingConventionPOF & rConv ) const
+bool FormulaMissingContext::AddMissing( FormulaTokenArray *pNewArr, const MissingConvention & rConv ) const
{
if ( !mpFunc )
return false;
@@ -1194,81 +1253,87 @@ bool FormulaMissingContext::AddMissingPOF( FormulaTokenArray *pNewArr, const Mis
bool bRet = false;
const OpCode eOp = mpFunc->GetOpCode();
- // Add for both, PODF and ODFF
- switch (eOp)
+ switch (rConv.getConvention())
{
- case ocAddress:
- return AddDefaultArg( pNewArr, 2, 1.0 ); // abs
- default:
+ case MissingConvention::FORMULA_MISSING_CONVENTION_ODFF:
+ {
+ // Add for ODFF
+ switch (eOp)
+ {
+ case ocAddress:
+ return AddDefaultArg( pNewArr, 2, 1.0 ); // abs
+ default:
+ break;
+ }
+ }
+ break;
+ case MissingConvention::FORMULA_MISSING_CONVENTION_PODF:
+ {
+ // Add for PODF
+ switch (eOp)
+ {
+ case ocAddress:
+ return AddDefaultArg( pNewArr, 2, 1.0 ); // abs
+ case ocFixed:
+ return AddDefaultArg( pNewArr, 1, 2.0 );
+ case ocBetaDist:
+ case ocBetaInv:
+ case ocRMZ: // PMT
+ return AddDefaultArg( pNewArr, 3, 0.0 );
+ case ocZinsZ: // IPMT
+ case ocKapz: // PPMT
+ return AddDefaultArg( pNewArr, 4, 0.0 );
+ case ocBW: // PV
+ case ocZW: // FV
+ bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt
+ bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v
+ break;
+ case ocZins: // RATE
+ bRet |= AddDefaultArg( pNewArr, 1, 0.0 ); // pmt
+ bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // fv
+ bRet |= AddDefaultArg( pNewArr, 4, 0.0 ); // type
+ break;
+ case ocExternal:
+ return AddMissingExternal( pNewArr );
+
+ // --- more complex cases ---
+
+ case ocOffset:
+ // FIXME: rather tough.
+ // if arg 3 (height) omitted, export arg1 (rows)
+ break;
+ default:
+ break;
+ }
+ }
+ break;
+ case MissingConvention::FORMULA_MISSING_CONVENTION_OOXML:
+ {
+ switch (eOp)
+ {
+ case ocExternal:
+ return AddMissingExternal( pNewArr );
+ default:
+ break;
+ }
+ }
break;
- }
-
- if (rConv.isODFF())
- {
- // Add for ODFF
- }
- else
- {
- // Add for PODF
- switch (eOp)
- {
- case ocFixed:
- return AddDefaultArg( pNewArr, 1, 2.0 );
- case ocBetaDist:
- case ocBetaInv:
- case ocRMZ: // PMT
- return AddDefaultArg( pNewArr, 3, 0.0 );
- case ocZinsZ: // IPMT
- case ocKapz: // PPMT
- return AddDefaultArg( pNewArr, 4, 0.0 );
- case ocBW: // PV
- case ocZW: // FV
- bRet |= AddDefaultArg( pNewArr, 2, 0.0 ); // pmt
- bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // [fp]v
- break;
- case ocZins: // RATE
- bRet |= AddDefaultArg( pNewArr, 1, 0.0 ); // pmt
- bRet |= AddDefaultArg( pNewArr, 3, 0.0 ); // fv
- bRet |= AddDefaultArg( pNewArr, 4, 0.0 ); // type
- break;
- case ocExternal:
- return AddMissingExternal( pNewArr );
-
- // --- more complex cases ---
-
- case ocOffset:
- // FIXME: rather tough.
- // if arg 3 (height) omitted, export arg1 (rows)
- break;
- default:
- break;
- }
}
return bRet;
}
-bool FormulaMissingContext::AddMissingOOXML( FormulaTokenArray *pNewArr ) const
+bool FormulaTokenArray::NeedsPodfRewrite( const MissingConventionODF & rConv )
{
- if ( !mpFunc )
- return false;
-
- bool bRet = false;
- const OpCode eOp = mpFunc->GetOpCode();
-
- switch (eOp)
+ for ( FormulaToken *pCur = First(); pCur; pCur = Next() )
{
- case ocExternal:
- return AddMissingExternal( pNewArr );
- break;
-
- default:
- break;
+ if ( rConv.isRewriteNeeded( pCur->GetOpCode()))
+ return true;
}
- return bRet;
+ return false;
}
-bool FormulaTokenArray::NeedsPofRewrite( const MissingConventionPOF & rConv )
+bool FormulaTokenArray::NeedsOoxmlRewrite( const MissingConventionOOXML & rConv )
{
for ( FormulaToken *pCur = First(); pCur; pCur = Next() )
{
@@ -1279,7 +1344,7 @@ bool FormulaTokenArray::NeedsPofRewrite( const MissingConventionPOF & rConv )
}
-FormulaTokenArray * FormulaTokenArray::RewriteMissing( bool bIsOOXML, const MissingConventionPOF & rConv )
+FormulaTokenArray * FormulaTokenArray::RewriteMissing( const MissingConvention & rConv )
{
const size_t nAlloc = 256;
FormulaMissingContext aCtx[ nAlloc ];
@@ -1322,17 +1387,11 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( bool bIsOOXML, const Miss
++nFn; // all following operations on _that_ function
pCtx[ nFn ].mpFunc = PeekPrevNoSpaces();
pCtx[ nFn ].mnCurArg = 0;
- if ( !bIsOOXML )
- {
- if (pCtx[ nFn ].mpFunc && pCtx[ nFn ].mpFunc->GetOpCode() == ocAddress && !rConv.isODFF())
- pOcas[ nOcas++ ] = nFn; // entering ADDRESS() if PODF
- }
+ if (rConv.isPODF() && pCtx[ nFn ].mpFunc && pCtx[ nFn ].mpFunc->GetOpCode() == ocAddress)
+ pOcas[ nOcas++ ] = nFn; // entering ADDRESS() if PODF
break;
case ocClose:
- if ( bIsOOXML )
- pCtx[ nFn ].AddMoreArgsOOXML( pNewArr );
- else
- pCtx[ nFn ].AddMoreArgsPOF( pNewArr, rConv );
+ pCtx[ nFn ].AddMoreArgs( pNewArr, rConv );
DBG_ASSERT( nFn > 0, "FormulaTokenArray::RewriteMissing: underflow");
if (nOcas > 0 && pOcas[ nOcas-1 ] == nFn)
--nOcas; // leaving ADDRESS()
@@ -1349,12 +1408,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( bool bIsOOXML, const Miss
break;
case ocMissing:
if ( bAdd )
- {
- if ( bIsOOXML )
- bAdd = !pCtx[ nFn ].AddMissingOOXML( pNewArr );
- else
- bAdd = !pCtx[ nFn ].AddMissingPOF( pNewArr, rConv );
- }
+ bAdd = !pCtx[ nFn ].AddMissing( pNewArr, rConv );
break;
default:
break;
@@ -1371,65 +1425,6 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( bool bIsOOXML, const Miss
return pNewArr;
}
-/*
- * fdo 81596
-Test status ( . : in progress , v : tested , - not applicable )
-finished:
-- ocCosecant: // for OOXML not rewritten anymore
-- ocSecant: // for OOXML not rewritten anymore
-- ocCot: // for OOXML not rewritten anymore
-- ocCosecantHyp: // for OOXML not rewritten anymore
-- ocSecantHyp: // for OOXML not rewritten anymore
-- ocCotHyp: // for OOXML not rewritten anymore
-- ocArcCot: // for OOXML not rewritten anymore
-- ocArcCotHyp: // ACOTH(x), not needed for Excel2013 and later
-- ocChose: // CHOOSE() - no rewrite needed, it seems
-v ocEuroConvert:
-v ocIf:
-v ocRound:
-v ocRoundUp:
-v ocRoundDown:
-v ocGammaDist:
-v ocPoissonDist:
-v ocNormDist:
-v ocLogNormDist:
-
-To be implemented yet:
- ocExternal: ?
- ocMacro: ?
- ocIndex: INDEX() ?
- ocFDist: // later, fdo40835
-*/
-bool FormulaTokenArray::NeedsOOXMLRewrite()
-{
- for ( FormulaToken *pCur = First(); pCur; pCur = Next() )
- {
- switch ( pCur->GetOpCode() )
- {
- case ocIf:
-
- case ocExternal:
- case ocEuroConvert:
- case ocMacro:
-
- case ocRound:
- case ocRoundUp:
- case ocRoundDown:
-
- case ocIndex:
-
- case ocGammaDist:
- case ocPoissonDist:
- case ocNormDist:
- case ocLogNormDist:
- return true;
- default:
- break;
- }
- }
- return false;
-}
-
bool FormulaTokenArray::MayReferenceFollow()
{
if ( pCode && nLen > 0 )
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index e3589d9..ceb8425 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -53,14 +53,41 @@ typedef sal_uInt8 ScRecalcMode;
class FormulaMissingContext;
-class FORMULA_DLLPUBLIC MissingConventionPOF
+class FORMULA_DLLPUBLIC MissingConvention
{
- bool mbODFF; /// TRUE: ODFF, FALSE: PODF
public:
- explicit MissingConventionPOF( bool bODFF ) : mbODFF(bODFF) {}
+ enum Convention
+ {
+ FORMULA_MISSING_CONVENTION_PODF,
+ FORMULA_MISSING_CONVENTION_ODFF,
+ FORMULA_MISSING_CONVENTION_OOXML
+ };
+ explicit MissingConvention( Convention eConvention ) : meConvention(eConvention) {}
+ inline bool isPODF() const { return meConvention == FORMULA_MISSING_CONVENTION_PODF; }
+ inline Convention getConvention() const { return meConvention; }
+private:
+ Convention meConvention;
+};
+
+class FORMULA_DLLPUBLIC MissingConventionODF : public MissingConvention
+{
+public:
+ explicit MissingConventionODF( bool bODFF ) :
+ MissingConvention( bODFF ?
+ MissingConvention::FORMULA_MISSING_CONVENTION_ODFF :
+ MissingConvention::FORMULA_MISSING_CONVENTION_PODF)
+ {
+ }
+ // Implementation and usage only in token.cxx
+ inline bool isRewriteNeeded( OpCode eOp ) const;
+};
+
+class FORMULA_DLLPUBLIC MissingConventionOOXML : public MissingConvention
+{
+public:
+ explicit MissingConventionOOXML() : MissingConvention( MissingConvention::FORMULA_MISSING_CONVENTION_OOXML) {}
// Implementation and usage only in token.cxx
inline bool isRewriteNeeded( OpCode eOp ) const;
- inline bool isODFF() const { return mbODFF; }
};
class FORMULA_DLLPUBLIC FormulaTokenArray
@@ -238,18 +265,19 @@ public:
FormulaTokenArray& operator=( const FormulaTokenArray& );
/** Determines if this formula needs any changes to convert it to something
- previous versions of OOo could consume (Plain Old Formula). */
- bool NeedsPofRewrite(const MissingConventionPOF & rConv);
+ previous versions of OOo could consume (Plain Old Formula, pre-ODFF, or
+ also ODFF) */
+ bool NeedsPodfRewrite( const MissingConventionODF & rConv );
- /** Determines if this formula needs any changes to convert it to OOXML */
- bool NeedsOOXMLRewrite();
+ /** Determines if this formula needs any changes to convert it to OOXML. */
+ bool NeedsOoxmlRewrite( const MissingConventionOOXML & rConv );
/** Rewrites to Plain Old Formula or OOXML, substituting missing parameters. The
FormulaTokenArray* returned is new'ed. */
- FormulaTokenArray* RewriteMissing( bool bIsOOXML, const MissingConventionPOF & rConv );
+ FormulaTokenArray* RewriteMissing( const MissingConvention & rConv );
/** Determines if this formula may be followed by a reference. */
- bool MayReferenceFollow();
+ bool MayReferenceFollow();
};
inline OpCode FormulaTokenArray::GetOuterFuncOpCode()
commit 3dd241c52d6db424bd4696ff8f223976542e411b
Author: Eike Rathke <erack at redhat.com>
Date: Thu Nov 27 21:15:06 2014 +0100
sensible indenting, fdo#81596 related
Change-Id: If7eb11a950b45793d04837d02f9546a93673fa2f
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 870d8f2..cfdae59 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1744,15 +1744,12 @@ void FormulaCompiler::CreateStringFromTokenArray( OUStringBuffer& rBuffer )
if (pArr->NeedsPofRewrite( aConv))
pArr = pArr->RewriteMissing( false, aConv );
}
- else
+ else if ( FormulaGrammar::isOOXML( meGrammar ) )
{
// fdo#81596
- if ( FormulaGrammar::isOOXML( meGrammar ) )
- {
// Scan token array for missing args and rewrite if present.
if ( pArr->NeedsOOXMLRewrite() )
pArr = pArr->RewriteMissing( true, aConv );
- }
}
// At least one character per token, plus some are references, some are
More information about the Libreoffice-commits
mailing list