[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-6' - sc/source

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit fd6e8b80a8f84d4d2caec1838b787443f623168f
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Oct 12 19:47:44 2016 +0200

    create NoName error token instead of setting error at the token array
    
    ... when handling name token. This can happen when importing BIFF .xls and the
    original range is not present in the document. The document is broken, but such
    formula can continue to work if the range expression was not actually executed,
    for example IF(TRUE(),then_good,else_bad_range) where else_bad_range is #NAME?
    error.
    
    (cherry picked from commit d3645961d98ce9f0cfb1ef7f0aba7bf020b90945)
    
    Change-Id: I823ac89115418cf5069b2baf5c5de2c814319ae7
    Reviewed-on: https://gerrit.libreoffice.org/29795
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit f81b2592cd93dac2cb78fdb22bf661d04bdef25f)
    Reviewed-on: https://gerrit.libreoffice.org/29818
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index e161b12..5d0af7e 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4442,6 +4442,7 @@ ScRangeData* ScCompiler::GetRangeData( const FormulaToken& rToken ) const
 
 bool ScCompiler::HandleRange()
 {
+    ScTokenArray* pNew;
     const ScRangeData* pRangeData = GetRangeData( *mpToken);
     if (pRangeData)
     {
@@ -4450,7 +4451,6 @@ bool ScCompiler::HandleRange()
             SetError( errNoName );
         else if (mbJumpCommandReorder)
         {
-            ScTokenArray* pNew;
             // put named formula into parentheses.
             // But only if there aren't any yet, parenthetical
             // ocSep doesn't work, e.g. SUM((...;...))
@@ -4491,7 +4491,15 @@ bool ScCompiler::HandleRange()
         }
     }
     else
-        SetError(errNoName);
+    {
+        // No ScRangeData for an already compiled token can happen in BIFF .xls
+        // import if the original range is not present in the document.
+        pNew = new ScTokenArray;
+        pNew->Add( new FormulaErrorToken(errNoName));
+        PushTokenArray( pNew, true );
+        pNew->Reset();
+        return GetToken();
+    }
     return true;
 }