diff options
author | Eike Rathke <erack@erack.de> | 2011-08-12 17:48:37 +0200 |
---|---|---|
committer | Eike Rathke <erack@erack.de> | 2011-08-14 00:12:45 +0200 |
commit | baca3632869b2b0b81e5a7dd83b189d3c8367652 (patch) | |
tree | 08d0a12349f5245b188f00ef0d40216c8cde0bdb /formula/inc | |
parent | 7e8e85adbee73346403c364326544487677cd5c6 (diff) |
fdo#37391 write and read [#REF!] in ODFF for reference errors
* write [#REF!] to ODFF when any part of the reference is invalid
* read [#REF!] as reference error
* display #REF! in UI
+ parse #REF! in UI
+ implemented error constants defined in ODFF as error tokens
+ parse error constants from ODFF and in UI
* fixed SUM, AVERAGE, SUMSQ, PRODUCT to propagate error
Diffstat (limited to 'formula/inc')
-rw-r--r-- | formula/inc/formula/FormulaCompiler.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index 9ff456beb4d2..e053c57751df 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -211,6 +211,9 @@ public: const ::com::sun::star::sheet::FormulaOpCodeMapEntry > & rMapping, bool bEnglish ); + /** Get current OpCodeMap in effect. */ + inline OpCodeMapPtr GetCurrentOpCodeMap() const { return mxSymbols; } + /** Get OpCode for English symbol. Used in XFunctionAccess to create token array. @param rName @@ -272,6 +275,9 @@ protected: virtual void LocalizeString( String& rName ); // modify rName - input: exact name virtual sal_Bool IsImportingXML() const; + sal_uInt16 GetErrorConstant( const String& rName ); + void AppendErrorConstant( rtl::OUStringBuffer& rBuffer, sal_uInt16 nError ); + sal_Bool GetToken(); OpCode NextToken(); void PutCode( FormulaTokenRef& ); |