[gnumeric] Make sheet objects invisible outline from .xls files persistent. [#637393]

[Jean Bréfort <jbrefort src gnome org>]

commit 45da75af020325699d104e8d5e742ca2823e4589
Author: Jean Brefort <jean brefort normalesup org>
Date:   Fri Dec 17 11:59:19 2010 +0100

    Make sheet objects invisible outline from .xls files persistent. [#637393]

 NEWS                           |    1 +
 plugins/excel/ChangeLog        |    6 ++++++
 plugins/excel/ms-excel-read.c  |    5 ++---
 plugins/excel/ms-excel-write.c |    4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 23efaf7..52741d3 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Andreas:
 
 Jean:
 	* Only disable the formula bar when a chart sheet is selected. [#636031]
+	* Make sheet objects invisible outline from .xls files persistent. [#637393]
 
 Morten:
 	* Fix array intersection problem with IF.  [#633433]
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index a3eb24d..8acdb79 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-17  Jean Brefort  <jean brefort normalesup org>
+
+	* ms-excel-read.c (ms_sheet_realize_obj): make object invisible outline
+	persistent. [#637393]
+	* ms-excel-write.c (excel_write_textbox_or_widget_v8):
+
 2010-11-25  Morten Welinder <terra gnome org>
 
 	* Release 1.10.12
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 22065c4..529db8f 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -625,9 +625,8 @@ ms_sheet_realize_obj (MSContainer *container, MSObj *obj)
 			 GO_COLOR_BLACK, &style->line.auto_color);
 		style->line.width = ms_obj_attr_get_uint (obj->attrs,
 			MS_OBJ_ATTR_OUTLINE_WIDTH, 0) / 256.;
-		style->line.auto_dash =
-			(ms_obj_attr_bag_lookup (obj->attrs, MS_OBJ_ATTR_OUTLINE_HIDE) != NULL);
-		style->line.dash_type = style->line.auto_dash
+		style->line.auto_dash = FALSE;
+		style->line.dash_type = (ms_obj_attr_bag_lookup (obj->attrs, MS_OBJ_ATTR_OUTLINE_HIDE) != NULL)
 			? GO_LINE_NONE
 			: ms_escher_xl_to_line_type (ms_obj_attr_get_int (obj->attrs, MS_OBJ_ATTR_OUTLINE_STYLE, 0));
 		style->fill.pattern.back = ms_sheet_map_color
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 17a9ca9..101acb8 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -4417,11 +4417,13 @@ excel_write_textbox_or_widget_v8 (ExcelWriteSheet *esheet,
 		gint32 w = CLAMP (12700 * style->line.width, 0, G_MAXINT32);
 		ms_escher_opt_add_simple (escher, optmark, MSEP_LINEWIDTH, w);
 	}
-	if (style && !style->line.auto_dash) {
+	if (style) {
 		int d = ms_escher_line_type_to_xl (style->line.dash_type);
 		if (d >= 0)
 			ms_escher_opt_add_simple (escher, optmark,
 						  MSEP_LINEDASHING, d);
+		else
+			ms_escher_opt_add_bool (escher, optmark, MSEP_LINE, FALSE);
 	}
 	if (is_widget)
 		ms_escher_opt_add_bool (escher, optmark, MSEP_LINE, FALSE);