[gnumeric] Handle unusual styles created in xls import. [#671745]

[Andreas J. Guelzow <guelzow src gnome org>]

commit e21d345ab058a78e64bbf38c4621e2bc42cd504b
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Fri Mar 9 17:42:20 2012 -0700

    Handle unusual styles created in xls import. [#671745]
    
    2012-03-10  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-write.c (odf_write_style_cell_properties): allow for
    	set background color without pattern, default to pattern 1

 NEWS                                  |    9 +++++----
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-write.c |    4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/NEWS b/NEWS
index 09191d2..40a0e7d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
 Gnumeric 1.11.3
 
 Andreas:
-	* On ODF import of stacked column charts, set LibreOffice's default overlap.
-	[#670692]
-	* On ODF import set series to default to ignoring invalids for interpolation.
-	[#671508]
+	* On ODF import of stacked column charts, set LibreOffice's default
+	overlap. [#670692]
+	* On ODF import set series to default to ignoring invalids for
+	interpolation. [#671508]
+	* Handle unusual styles created in xls import. [#671745]
 
 Jean:
 	* Fixed crash with sheet object. [#671617]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 551e22f..3a79d4f 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-10  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* openoffice-write.c (odf_write_style_cell_properties): allow for
+	set background color without pattern, default to pattern 1
+
 2012-03-09  Morten Welinder  <terra gnome org>
 
 	* openoffice-write.c (odf_write_sheet): Use new
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 8a38b3a..71865ae 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -1101,7 +1101,9 @@ odf_write_style_cell_properties (GnmOOExport *state, GnmStyle const *style)
 /* Background Color */
 	if (gnm_style_is_element_set (style, MSTYLE_COLOR_BACK))
 		gnm_xml_out_add_hex_color (state->xml, FOSTYLE "background-color",
-					   gnm_style_get_back_color (style), gnm_style_get_pattern (style));
+					   gnm_style_get_back_color (style), 
+					   gnm_style_is_element_set (style, MSTYLE_PATTERN) ? 
+					   gnm_style_get_pattern (style) : 1);
 /* Borders */
 	BORDERSTYLE(MSTYLE_BORDER_TOP,FOSTYLE "border-top", STYLE "border-line-width-top", GNMSTYLE "border-line-style-top");
 	BORDERSTYLE(MSTYLE_BORDER_BOTTOM,FOSTYLE "border-bottom", STYLE "border-line-width-bottom", GNMSTYLE "border-line-style-bottom");