[gnumeric] Do not overwrite formats stored in an ODF file

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

commit 3fdf803d792f308c0333a3a8f40d9df976cc7bf5
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Tue Jun 23 16:22:04 2009 -0600

    Do not overwrite formats stored in an ODF file
    
    2009-06-23 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-read.c (oo_cell_start): do not overwrite formats
    	  from the file

 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index c49b9a7..c224d10 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2009-06-23 Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-read.c (oo_cell_start): do not overwrite formats 
+	  from the file
+
+2009-06-23 Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-read.c (OOParseState): separate format item and
 	  change references throughout
 	(oo_date_hours): handle elapsed times better
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 3e5a027..112da3b 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -1195,7 +1195,7 @@ oo_cell_start (GsfXMLIn *xin, xmlChar const **attrs)
 	merge_cols = MIN (merge_cols, max_cols - state->pos.eval.col);
 	merge_rows = MIN (merge_rows, max_rows - state->pos.eval.row);
 
-	if (has_datetime || has_date || has_time) {
+	if ((state->ver == OOO_VER_1) && (has_datetime || has_date || has_time)) {
 		GOFormat *format;
 
 		if (has_datetime) {