[gnumeric] odf: fuzzed file fix re derived cell formats

[Morten Welinder <mortenw src gnome org>]

commit 539dc95566971dc2bd770ba7d0ded7e4902d2945
Author: Morten Welinder <terra gnome org>
Date:   Wed Jun 24 12:58:54 2015 -0400

    odf: fuzzed file fix re derived cell formats

 NEWS                                 |    2 +-
 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |   29 +++++++++++------------------
 3 files changed, 17 insertions(+), 19 deletions(-)
---
diff --git a/NEWS b/NEWS
index e8c7a4b..89ec6be 100644
--- a/NEWS
+++ b/NEWS
@@ -29,7 +29,7 @@ Morten:
          [#749236] [#749240] [#749234] [#749235] [#749271] [#749270]
          [#749424] [#749917] [#749919] [#750043] [#750044] [#750046]
          [#750811] [#750810] [#750857] [#750864] [#750862] [#750858]
-         [#751126] [#751254] [#751253] [#750851] [#751258]
+         [#751126] [#751254] [#751253] [#750851] [#751258] [#751259]
        * 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 97918fa..a2efe8f 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-24  Morten Welinder  <terra gnome org>
+
+       * openoffice-read.c (odf_oo_cell_style_copy): Use correct copy
+       function for styles.  Fixes #751259.
+
 2015-06-18  Andreas J. Guelzow <aguelzow pyrshep ca>
 
        * openoffice-read.c (oo_conventions_new): set union_char
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index e7124bc..4710ec0 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -3317,23 +3317,6 @@ odf_oo_cell_style_new (GnmStyle *style)
        return oostyle;
 }
 
-static GnmStyle *
-odf_gnm_style_ref (GnmStyle *style)
-{
-       gnm_style_ref (style);
-       return style;
-}
-
-static OOCellStyle *
-odf_oo_cell_style_copy (OOCellStyle *oostyle)
-{
-       OOCellStyle *new = odf_oo_cell_style_new (oostyle->style);
-       new->styles = go_slist_map (oostyle->styles, (GOMapFunc)odf_gnm_style_ref);
-       new->conditions = go_slist_map (oostyle->conditions, (GOMapFunc)g_strdup);
-       new->bases = go_slist_map (oostyle->bases, (GOMapFunc)g_strdup);
-       return new;
-}
-
 static void
 odf_oo_cell_style_unref (OOCellStyle *oostyle)
 {
@@ -3353,9 +3336,19 @@ odf_oo_cell_style_ref (OOCellStyle *oostyle)
        return oostyle;
 }
 
+static OOCellStyle *
+odf_oo_cell_style_copy (OOCellStyle *oostyle)
+{
+       OOCellStyle *new = odf_oo_cell_style_new (oostyle->style);
+       new->styles = go_slist_map (oostyle->styles, (GOMapFunc)odf_oo_cell_style_ref);
+       new->conditions = go_slist_map (oostyle->conditions, (GOMapFunc)g_strdup);
+       new->bases = go_slist_map (oostyle->bases, (GOMapFunc)g_strdup);
+       return new;
+}
+
 static void
 odf_oo_cell_style_attach_condition (OOCellStyle *oostyle, OOCellStyle *cstyle,
-                               gchar const *condition, gchar const *base)
+                                   gchar const *condition, gchar const *base)
 {
        g_return_if_fail (oostyle != NULL);
        g_return_if_fail (cstyle != NULL);