[gnumeric] Fix data merges. [#699897]



commit f467662a50a3c577f28ffe881e4f23dac1ba33c8
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed May 8 00:47:36 2013 -0600

    Fix data merges. [#699897]
    
    2013-05-08  Andreas J. Guelzow <aguelzow pyrshep ca>
    
        * src/commands.c (cmd_merge_data_redo): use gnm_cell_set_value
        rather than gnm_cell_assign_value

 ChangeLog      |    5 +++++
 NEWS           |    1 +
 src/commands.c |    4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4136eb3..4b44dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-08  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+       * src/commands.c (cmd_merge_data_redo): use gnm_cell_set_value
+       rather than gnm_cell_assign_value
+
 2013-05-06  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * src/sheet-utils.c (gnm_sheet_guess_data_range): also check
diff --git a/NEWS b/NEWS
index 4c47455..8ef8356 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Gnumeric 1.12.3
 Andreas:
        * Fix border handling for merged cells in LaTeX export.
        * Fix 'Go to First'. [#699631]
+       * Fix data merges. [#699897]
 
 Morten:
        * Improve xlsx import of style-only cells.
diff --git a/src/commands.c b/src/commands.c
index 0ebe12d..f62dd30 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -5578,12 +5578,12 @@ cmd_merge_data_redo (GnmCommand *cmd, WorkbookControl *wbc)
                                GnmCell *target_cell = sheet_cell_get ((Sheet *)target_sheet->data,
                                                                      col_target, row_target);
                                if (target_cell != NULL)
-                                       gnm_cell_assign_value (target_cell,
+                                       gnm_cell_set_value (target_cell,
                                                           value_new_empty ());
                        } else {
                                GnmCell *target_cell = sheet_cell_fetch ((Sheet *)target_sheet->data,
                                                                      col_target, row_target);
-                               gnm_cell_assign_value (target_cell,
+                               gnm_cell_set_value (target_cell,
                                                   value_dup (source_cell->value));
                        }
                        target_sheet = target_sheet->next;


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