diff options
| author | Eike Rathke <erack@erack.de> | 2011-09-11 14:56:32 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@erack.de> | 2011-09-11 15:21:03 +0200 |
| commit | 34c9a01b075788653b89c244eb8b3fcee54bfa68 (patch) | |
| tree | d657756d986979ab6b631a70678b0325cba55933 /formula/inc/formula/FormulaCompiler.hxx | |
| parent | 59b36fc62e21cce62fd63f0dcc79ff9cb66b35b8 (diff) | |
fix fdo#40590 stop abusing regular string token for XML import
During XML import formulas of defined names and conditional formatting
were remembered as regular svString tokens that then later were
retrieved without quotes for compilation. This didn't go along with the
new ScRangeData::CompileUnresolvedXML() that recreates the formula
string from an already tokenized form of the formula.
Introduced FormulaToken::AddStringXML() with ocStringXML to sort those
out and removed the IsImportingXML() hack from
FormulaCompiler::AppendString(), the ocStringXML case is handled in
FormulaCompiler::CreateStringFromToken().
Diffstat (limited to 'formula/inc/formula/FormulaCompiler.hxx')
| -rw-r--r-- | formula/inc/formula/FormulaCompiler.hxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index 825a31e9863b..215115214fc5 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -273,7 +273,6 @@ protected: virtual void CreateStringFromMatrix(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken* pTokenP); virtual void LocalizeString( String& rName ); // modify rName - input: exact name - virtual bool IsImportingXML() const; sal_uInt16 GetErrorConstant( const String& rName ); void AppendErrorConstant( rtl::OUStringBuffer& rBuffer, sal_uInt16 nError ); |