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/source/ui/docshell/docfunc.cxx | |
| 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/source/ui/docshell/docfunc.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 7410da8f224e..dbb567ff455f 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1010,9 +1010,9 @@ sal_Bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngi ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const String& rText, const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) { ScTokenArray* pCode = new ScTokenArray; - pCode->AddString( rText ); + pCode->AddStringXML( rText ); if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL) && (rFormulaNmsp.Len() > 0) ) - pCode->AddString( rFormulaNmsp ); + pCode->AddStringXML( rFormulaNmsp ); return pCode; } |