[gnumeric] ods: fuzzed file fix re center-across-selection



commit 471dbfa3875cef68d61d6f560a7557a8a6707553
Author: Morten Welinder <terra gnome org>
Date:   Fri Jun 12 13:20:15 2015 -0400

    ods: fuzzed file fix re center-across-selection

 NEWS                                  |    2 +-
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-write.c |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index ccc35ab..f053a08 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,7 @@ Morten:
          [#749069] [#748533] [#749118] [#749166] [#749181] [#749184]
          [#749236] [#749240] [#749234] [#749235] [#749271] [#749270]
          [#749424] [#749917] [#749919] [#750043] [#750044] [#750046]
-         [#750811] [#750810]
+         [#750811] [#750810] [#750857]
        * Make solver check linearity of model.
        * Fix xls saving of marker style.  [#749185]
        * Make compilation with clang work again.  [#749138]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 053243f..80034a7 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-12  Morten Welinder  <terra gnome org>
+
+       * openoffice-write.c (odf_write_cell): Add check for null cell in
+       center-across-selection case.  Fixes #750857.
+
 2015-06-10  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-read.c (oo_func_map_in): some mapping adjustment
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 8eff2da..89e0159 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -3379,7 +3379,7 @@ odf_write_cell (GnmOOExport *state, GnmCell *cell, GnmRange const *merge_range,
                cols_spanned = merge_range->end.col - merge_range->start.col + 1;
        }
 
-       if (style && cols_spanned <= 1 && gnm_style_get_align_h (style) == 
GNM_HALIGN_CENTER_ACROSS_SELECTION) {
+       if (style && cell && cols_spanned <= 1 && gnm_style_get_align_h (style) == 
GNM_HALIGN_CENTER_ACROSS_SELECTION) {
                /* We have to simulate GNM_HALIGN_CENTER_ACROSS_SELECTION by a merge */
                int cell_col = cell->pos.col;
                int cell_row = cell->pos.row;


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