diff options
author | Eike Rathke <erack@redhat.com> | 2018-01-29 18:23:22 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2018-01-29 18:45:49 +0100 |
commit | eae9648e99be53ba441d9d8207aac6f3ce211ef2 (patch) | |
tree | aab1767169a704750fde7fb3622d652f999e4b73 /sc | |
parent | 3ddb9a027bb138fd7640abd4ed8d10fda95a94f8 (diff) |
CheckLinkFormulaNeedingCheck() for .ods named expressions
This is specifically necessary for named expressions that are used
in conditional format formulas, for which RPN is generated at a
later stage, not during import.
Change-Id: Ia8e1d92a3a12f6c226fec56e85f23f122f2fe902
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/tool/rangenam.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 8a6255651b08..5e1c90a3ece7 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -63,9 +63,14 @@ ScRangeData::ScRangeData( ScDocument* pDok, mnMaxCol (-1) { if (!rSymbol.isEmpty()) - CompileRangeData( rSymbol, pDoc->IsImportingXML()); + { // Let the compiler set an error on unknown names for a subsequent // CompileUnresolvedXML(). + const bool bImporting = pDoc->IsImportingXML(); + CompileRangeData( rSymbol, bImporting); + if (bImporting) + pDoc->CheckLinkFormulaNeedingCheck( *pCode); + } else { // #i63513#/#i65690# don't leave pCode as NULL. @@ -194,6 +199,7 @@ void ScRangeData::CompileUnresolvedXML( sc::CompileFormulaContext& rCxt ) // Don't let the compiler set an error for unknown names on final // compile, errors are handled by the interpreter thereafter. CompileRangeData( aSymbol, false); + rCxt.getDoc()->CheckLinkFormulaNeedingCheck( *pCode); } } |