[gnumeric] [XL] Spreadsheetml-2003 enable support for built fmts.

[Jody Goldberg <jody src gnome org>]

commit e4c22307affb2439f0b5211d892db8cb4e093299
Author: Jody Goldberg <jody gnome org>
Date:   Sat Apr 11 10:50:50 2009 -0400

    [XL] Spreadsheetml-2003 enable support for built fmts.
---
 NEWS                           |    1 +
 plugins/excel/ChangeLog        |    8 ++++++++
 plugins/excel/excel-xml-read.c |    9 ++++++---
 plugins/excel/plugin.xml.in    |    1 -
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 0c15c8b..805dcc0 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ Andreas:
 
 Jody:
 	* XLSX start reading external refs.
+	* XL2003-XML enable the use of builtin formats, and drop '.sml' kludge.
 
 Morten:
 	* Fix xls save problem with sheets that are too big for the format.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index f62e571..2e373d8 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -34,6 +34,14 @@
 	* ms-excel-write.c: ditto.
 	* xlsx-read.c: ditto.
 
+2009-04-11  Jody Goldberg <jody gnome org>
+
+	* plugin.xml.in : get rid of bogus .sml suffix now that we have
+	  probing.
+	* excel-xml-read.c : accept title and description in metadata
+	(xl_xml_col_start) : only assign width > 0.
+	(xl_xml_num_fmt) : fix previous patch.
+
 2009-04-02  Morten Welinder  <terra gnome org>
 
 	* ms-excel-write.c (excel_sheet_new): Limit maxcols to what we
diff --git a/plugins/excel/excel-xml-read.c b/plugins/excel/excel-xml-read.c
index 01213ba..1d3430a 100644
--- a/plugins/excel/excel-xml-read.c
+++ b/plugins/excel/excel-xml-read.c
@@ -324,7 +324,7 @@ xl_xml_col_start (GsfXMLIn *xin, xmlChar const **attrs)
 		gnm_style_ref (style);
 		sheet_style_set_range (state->sheet, &r, style);
 	}
-	if (width >= 0.)
+	if (width > 0.)
 		for (tmp = 0 ; tmp < span ; tmp++)
 			sheet_col_set_size_pts (state->sheet,
 				state->pos.col + tmp, width, !auto_fit);
@@ -744,12 +744,12 @@ xl_xml_num_fmt (GsfXMLIn *xin, xmlChar const **attrs)
 				if (0 == strcmp (attrs[1], named_formats[i].name))
 					fmt = go_format_new_from_XL (named_formats[i].format);
 
-			if (NULL != fmt)
+			if (NULL == fmt)
 				for (i = 0 ; named_magic_formats[i].name ; i++)
 					if (0 == strcmp (attrs[1], named_magic_formats[i].name))
 						fmt = go_format_new_magic (named_magic_formats[i].id);
 
-			if (NULL != fmt)
+			if (NULL == fmt)
 				fmt = go_format_new_from_XL (attrs[1]);
 			gnm_style_set_format (state->style, fmt);
 			go_format_unref (fmt);
@@ -933,6 +933,9 @@ GSF_XML_IN_NODE_FULL (START, WORKBOOK, XL_NS_SS, "Workbook", GSF_XML_NO_CONTENT,
     GSF_XML_IN_NODE (DOC_PROP, PROP_LAST_SAVED,	 XL_NS_O, "LastSaved",  GSF_XML_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (DOC_PROP, PROP_COMPANY,	 XL_NS_O, "Company",    GSF_XML_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (DOC_PROP, PROP_VERSION,	 XL_NS_O, "Version",    GSF_XML_CONTENT, NULL, NULL),
+    GSF_XML_IN_NODE (DOC_PROP, PROP_TITLE,      XL_NS_O, "Title",      GSF_XML_CONTENT, NULL, NULL),
+    GSF_XML_IN_NODE (DOC_PROP, PROP_DESCRIPTION, XL_NS_O, "Description",GSF_XML_CONTENT, NULL, NULL),
+
   GSF_XML_IN_NODE (WORKBOOK, DOC_SETTINGS, XL_NS_O, "OfficeDocumentSettings", GSF_XML_NO_CONTENT, NULL, NULL),
     GSF_XML_IN_NODE (DOC_SETTINGS, DOC_COLORS, XL_NS_O, "Colors", GSF_XML_NO_CONTENT, NULL, NULL),
       GSF_XML_IN_NODE (DOC_COLORS, DOC_COLOR,  XL_NS_O, "Color", GSF_XML_NO_CONTENT, NULL, NULL),
diff --git a/plugins/excel/plugin.xml.in b/plugins/excel/plugin.xml.in
index 028f085..54dabef 100644
--- a/plugins/excel/plugin.xml.in
+++ b/plugins/excel/plugin.xml.in
@@ -63,7 +63,6 @@
 			</information>
 			<suffixes>
 				<suffix>xml</suffix>
-				<suffix>sml</suffix> <!-- bogus.  necessary until we have better xml sniffing -->
 			</suffixes>
 		</service>