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 /sc/inc | |
| 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 'sc/inc')
| -rw-r--r-- | sc/inc/compiler.hxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index f7dde6ae7ed2..371192c2db2c 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -544,7 +544,6 @@ private: virtual void CreateStringFromMatrix( rtl::OUStringBuffer& rBuffer, formula::FormulaToken* _pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,formula::FormulaToken* _pTokenP); virtual void LocalizeString( String& rName ); // modify rName - input: exact name - virtual bool IsImportingXML() const; /// Access the CharTable flags inline sal_uLong GetCharTableFlags( sal_Unicode c, sal_Unicode cLast ) |