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

[Markus Mohrhard]

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

New commits:
commit f59fc4e1ce2d6a506fe5a11123cc32e8c7f16540
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Jan 27 06:33:46 2014 +0100

    we need to check that the content is equal as well, fdo#74077
    
    There are a few more tokens that need to be inspected.
    
    Change-Id: I59b5046ddde5eb8b638ad8f17b00bc7eb6966467
    Reviewed-on: https://gerrit.libreoffice.org/7675
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 05417b3..cad2144 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3473,6 +3473,30 @@ ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( ScFormulaCell& r
                     bInvariant = false;
             }
             break;
+            case formula::svDouble:
+            {
+                if(!rtl::math::approxEqual(pThisTok->GetDouble(), pOtherTok->GetDouble()))
+                    return NotEqual;
+            }
+            break;
+            case formula::svString:
+            {
+                if(pThisTok->GetString() != pOtherTok->GetString())
+                    return NotEqual;
+            }
+            break;
+            case formula::svIndex:
+            {
+                if(pThisTok->GetIndex() != pOtherTok->GetIndex())
+                    return NotEqual;
+            }
+            break;
+            case formula::svByte:
+            {
+                if(pThisTok->GetByte() != pOtherTok->GetByte())
+                    return NotEqual;
+            }
+            break;
             default:
                 ;
         }