[gnumeric] Fix reformatting of cells on expression entry. [#629303]

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

commit e22de1f4811d81653a61ab67f549269a52048807
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sun Sep 12 21:15:51 2010 -0600

    Fix reformatting of cells on expression entry. [#629303]
    
    2010-09-12  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/commands.c (cmd_set_text_full): Only auto format if no user style
    	  is set. Fixes 629303.

 ChangeLog      |    5 +++++
 NEWS           |    1 +
 src/commands.c |   14 +++++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e4fcf2f..89ac68f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-09-12  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/commands.c (cmd_set_text_full): Only auto format if no user style
+	  is set. Fixes 629303.
+
+2010-09-12  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* src/sheet-object-widget.c (sheet_widget_frame_*et_property): new
 	
 2010-09-09  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/NEWS b/NEWS
index 1b6119a..3a53f3f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Andreas:
 	* Read tab colors from OOo config in ODF files.
 	* Improve some ODF chart import/export.
 	* Import/export all sheet objects from and to ODF files.
+	* Fix reformatting of cells on expression entry. [#629303]
 
 --------------------------------------------------------------------------
 Gnumeric 1.10.10
diff --git a/src/commands.c b/src/commands.c
index 8ef646a..8679ccc 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -859,11 +859,15 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
 
 		text = g_strdup_printf (_("Inserting expression in %s"), name);
 
-		sf = auto_style_format_suggest (texpr, ep);
-		if (sf != NULL) {
-			new_style = gnm_style_new ();
-			gnm_style_set_format (new_style, sf);
-			go_format_unref (sf);
+		if (go_format_is_general 
+		    (gnm_style_get_format 
+		     (sheet_style_get (sheet, ep->eval.col, ep->eval.row)))) {
+			sf = auto_style_format_suggest (texpr, ep);
+			if (sf != NULL) {
+				new_style = gnm_style_new ();
+				gnm_style_set_format (new_style, sf);
+				go_format_unref (sf);
+			}
 		}
 
 		for (l = selection; l != NULL; l = l->next) {