[gnumeric] TABLE: Fix problems with repeated cells.



commit 725a4474a2b2291efaf0840693fa940b2874cc31
Author: Morten Welinder <terra gnome org>
Date:   Fri Sep 25 20:30:02 2015 -0400

    TABLE: Fix problems with repeated cells.

 ChangeLog          |    1 +
 NEWS               |    2 +-
 src/func-builtin.c |    4 +---
 3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5a7b512..e3ab81f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * src/func-builtin.c (gnumeric_table): Don't try to be smart and
        avoid value copying.  Fixes #752181.
+       (gnumeric_table): Handle repeated cells.  Fixes #752178.
 
 2015-09-20  Morten Welinder <terra gnome org>
 
diff --git a/NEWS b/NEWS
index 1c067f0..de00493 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 Gnumeric 1.12.25
 
 Morten:
-       * Fix TABLE problem.  [#752181]
+       * Fix TABLE problems.  [#752181]  [#752178]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.24
diff --git a/src/func-builtin.c b/src/func-builtin.c
index 099f2da..36c24e7 100644
--- a/src/func-builtin.c
+++ b/src/func-builtin.c
@@ -260,10 +260,8 @@ gnumeric_table (GnmFuncEvalInfo *ei, int argc, GnmExprConstPtr const *argv)
        for (x = 0 ; x < 3 ; x++) {
                int y;
                for (y = x + 1; y < 3; y++) {
-                       if (in[x] == in[y]) {
+                       if (in[x] == in[y])
                                in[y] = NULL;
-                               break;
-                       }
                }
 
                if (in[x]) {


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