[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/core/data/formulacell.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit c60c7d09e4d65b57ba448cf3de68391a51dcc1b5
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Fri Apr 11 21:37:54 2014 -0400

    fdo#77307: Compare external formula tokens correctly.
    
    To avoid different external (add-in) tokens from being evaluated equal.
    
    Change-Id: If78187901bdca7fe0da50442b0bb66e0650dc70f
    (cherry picked from commit f9cc0daec26016722bf5260e4e2634e6dcfe25a2)
    Reviewed-on: https://gerrit.libreoffice.org/8942
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 78c4fb0..b96d0ad 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3654,6 +3654,15 @@ ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( ScFormulaCell& r
                     return NotEqual;
             }
             break;
+            case formula::svExternal:
+            {
+                if (pThisTok->GetExternal() != pOtherTok->GetExternal())
+                    return NotEqual;
+
+                if (pThisTok->GetByte() != pOtherTok->GetByte())
+                    return NotEqual;
+            }
+            break;
             default:
                 ;
         }