diff options
| author | Winfried Donkers <winfrieddonkers@libreoffice.org> | 2014-08-08 17:39:04 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-11-27 20:09:26 +0000 |
| commit | 4feaf96f50fa89eccb4e7a638220099e9a8482f1 (patch) | |
| tree | ca4e30cdeee2eb1707221fa6ace783a447fd2f80 /include/formula | |
| parent | WW8_WrPlcSubDoc::WriteGenericTxt: fix missing indentation (diff) | |
| download | core-4feaf96f50fa89eccb4e7a638220099e9a8482f1.tar.gz core-4feaf96f50fa89eccb4e7a638220099e9a8482f1.zip | |
fdo#81596 export to OOXML that need argument changes
Change-Id: I3a99e416be9f3f04175939e4560f8f7c55497185
Reviewed-on: https://gerrit.libreoffice.org/10831
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/tokenarray.hxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index c6433aa43b07..e3589d997a96 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -53,11 +53,11 @@ typedef sal_uInt8 ScRecalcMode; class FormulaMissingContext; -class FORMULA_DLLPUBLIC MissingConvention +class FORMULA_DLLPUBLIC MissingConventionPOF { bool mbODFF; /// TRUE: ODFF, FALSE: PODF public: - explicit MissingConvention( bool bODFF ) : mbODFF(bODFF) {} + explicit MissingConventionPOF( bool bODFF ) : mbODFF(bODFF) {} // Implementation and usage only in token.cxx inline bool isRewriteNeeded( OpCode eOp ) const; inline bool isODFF() const { return mbODFF; } @@ -239,11 +239,14 @@ public: /** Determines if this formula needs any changes to convert it to something previous versions of OOo could consume (Plain Old Formula). */ - bool NeedsPofRewrite(const MissingConvention & rConv); + bool NeedsPofRewrite(const MissingConventionPOF & rConv); - /** Rewrites to Plain Old Formula, substituting missing parameters. The + /** Determines if this formula needs any changes to convert it to OOXML */ + bool NeedsOOXMLRewrite(); + + /** Rewrites to Plain Old Formula or OOXML, substituting missing parameters. The FormulaTokenArray* returned is new'ed. */ - FormulaTokenArray* RewriteMissingToPof(const MissingConvention & rConv); + FormulaTokenArray* RewriteMissing( bool bIsOOXML, const MissingConventionPOF & rConv ); /** Determines if this formula may be followed by a reference. */ bool MayReferenceFollow(); |