[gnumeric] ODS: Avoid criticals.

[Morten Welinder <mortenw src gnome org>]

commit e916286f0100584ca26624eed1f63c556bb31ab5
Author: Morten Welinder <terra gnome org>
Date:   Mon Aug 16 13:12:03 2010 -0400

    ODS: Avoid criticals.

 NEWS                                 |    1 +
 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    6 +++---
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index 5675fc0..fc912cf 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,7 @@ Morten:
 	* Survive malformed xml files.
 	* Fix win32 random problem.  [#533779]
 	* Fix IMPOWER problem.  [#627014]
+	* Avoid criticals in ODS import.
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.8
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index c350a1f..dfbc871 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-16  Morten Welinder  <terra gnome org>
+
+	* openoffice-read.c (oo_extent_sheet_rows, oo_extent_sheet_cols):
+	Avoid criticals.
+
 2010-08-16  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* openoffice-write.c (odf_write_plot): export legend position
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 5258293..b22159a 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -986,7 +986,7 @@ oo_extent_sheet_cols (Sheet *sheet, int cols)
 	gnm_sheet_suggest_size (&new_cols, &new_rows);
 
 	goundo = gnm_sheet_resize (sheet, new_cols, new_rows, NULL, &err);
-	g_object_unref (G_OBJECT (goundo));
+	if (goundo) g_object_unref (goundo);
 
 	return gnm_sheet_get_max_cols (sheet);
 }
@@ -1076,7 +1076,7 @@ oo_col_start (GsfXMLIn *xin, xmlChar const **attrs)
 static int
 oo_extent_sheet_rows (Sheet *sheet, int rows)
 {
-	GOUndo   * goundo;
+	GOUndo * goundo;
 	int new_cols, new_rows;
 	gboolean err;
 
@@ -1085,7 +1085,7 @@ oo_extent_sheet_rows (Sheet *sheet, int rows)
 	gnm_sheet_suggest_size (&new_cols, &new_rows);
 
 	goundo = gnm_sheet_resize (sheet, new_cols, new_rows, NULL, &err);
-	g_object_unref (G_OBJECT (goundo));
+	if (goundo) g_object_unref (goundo);
 
 	return gnm_sheet_get_max_rows (sheet);
 }