[gnumeric] ssdiff: fix check for inserted or removed names.



commit 1d886da028f4a5eeae3602e6b2e0a4ea71b52a1a
Author: Morten Welinder <terra gnome org>
Date:   Fri Dec 29 08:18:22 2017 -0500

    ssdiff: fix check for inserted or removed names.

 ChangeLog    |    5 +++++
 NEWS         |    3 +++
 src/ssdiff.c |    4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e7c5d64..5926eff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-29  Morten Welinder  <terra gnome org>
+
+       * src/ssdiff.c (diff_names): Fix checks for inserted or removed
+       name.  #792038.
+
 2017-12-28  Morten Welinder <terra gnome org>
 
        * configure.ac: Post-release bump.
diff --git a/NEWS b/NEWS
index 91b9d38..23388bb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.12.39
 
+Morten:
+       * Fix ssdiff problem.  [#792038]
+
 --------------------------------------------------------------------------
 Gnumeric 1.12.38
 
diff --git a/src/ssdiff.c b/src/ssdiff.c
index dce7b15..b6cb81e 100644
--- a/src/ssdiff.c
+++ b/src/ssdiff.c
@@ -1224,7 +1224,7 @@ diff_names (GnmDiffState *state,
                GnmNamedExpr const *on = lo ? lo->data : NULL;
                GnmNamedExpr const *nn = ln ? ln->data : NULL;
 
-               if (!nn || (on && cb_expr_name_by_name (on, nn)) < 0) {
+               if (!nn || (on && cb_expr_name_by_name (on, nn) < 0)) {
                        // Old name got removed
                        state->diff_found = TRUE;
                        state->actions->name_changed (state, on, nn);
@@ -1232,7 +1232,7 @@ diff_names (GnmDiffState *state,
                        continue;
                }
 
-               if (!on || (nn && cb_expr_name_by_name (on, nn)) > 0) {
+               if (!on || (nn && cb_expr_name_by_name (on, nn) > 0)) {
                        // New name got added
                        state->diff_found = TRUE;
                        state->actions->name_changed (state, on, nn);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]