[gnumeric] Sheet: fix problem with solver parameters.

[Morten Welinder <mortenw src gnome org>]

commit 7c49e8bba9c2740a7c7c4611aff63e470ff4d815
Author: Morten Welinder <terra gnome org>
Date:   Thu Aug 15 10:54:03 2013 -0400

    Sheet: fix problem with solver parameters.
    
    Solver parameters contain expressions which might reference other sheets.
    On shutdown we need to get rid of cross-sheet expressions fairly early.

 ChangeLog   |    5 +++++
 NEWS        |    1 +
 src/sheet.c |    5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d085714..8b3379b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-15  Morten Welinder  <terra gnome org>
+
+       * src/sheet.c (sheet_destroy_contents): Also get rid of solver
+       parameters.  See bug 705913, comment 6.
+
 2013-08-13  Morten Welinder  <terra gnome org>
 
        * src/gnm-style-impl.h (_GnmStyle): Switch ->deps to a GPtrArray.
diff --git a/NEWS b/NEWS
index 6d29daa..80da0f7 100644
--- a/NEWS
+++ b/NEWS
@@ -39,6 +39,7 @@ Morten:
        * Fix R1C1 parsing issue.  [#705637]
        * Improve handling of large-area conditional styles.
        * Fix (?) Applix pattern importer.  [#705946]
+       * Fix FMR.  [Part of #705913]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.4
diff --git a/src/sheet.c b/src/sheet.c
index f2a5f23..8e6781d 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -4497,6 +4497,8 @@ sheet_destroy_contents (Sheet *sheet)
        colrow_resize (&sheet->rows, 0);
        g_ptr_array_free (sheet->rows.info, TRUE);
        sheet->rows.info = NULL;
+
+       g_clear_object (&sheet->solver_parameters);
 }
 
 /**
@@ -4534,8 +4536,7 @@ gnm_sheet_finalize (GObject *obj)
 
        sheet_destroy (sheet);
 
-       g_object_unref (sheet->solver_parameters);
-       sheet->solver_parameters = NULL;
+       g_clear_object (&sheet->solver_parameters);
 
        g_list_free_full (sheet->scenarios, g_object_unref);
        sheet->scenarios = NULL;