[Libreoffice-commits] core.git: sc/source

Markus Mohrhard markus.mohrhard at googlemail.com
Sun Jan 26 21:37:57 PST 2014


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

New commits:
commit 3d1a4d246f6c82585c6ec8d5d856cf802bffcede
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

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index d7384b9..94abbbb 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3472,6 +3472,18 @@ 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;
             default:
                 ;
         }


More information about the Libreoffice-commits mailing list