goffice r2160 - in branches/goffice-0-6: . goffice/utils

[mortenw svn gnome org]

Author: mortenw
Date: Mon Jul 28 02:20:03 2008
New Revision: 2160
URL: http://svn.gnome.org/viewvc/goffice?rev=2160&view=rev

Log:
2008-07-27  Morten Welinder  <terra gnome org>

	* goffice/utils/go-format.c (go_format_get_family): If a number
	format has both a date and a time part, it's a date format.  Fixes
	#545016.



Modified:
   branches/goffice-0-6/ChangeLog
   branches/goffice-0-6/NEWS
   branches/goffice-0-6/goffice/utils/go-format.c

Modified: branches/goffice-0-6/NEWS
==============================================================================
--- branches/goffice-0-6/NEWS	(original)
+++ branches/goffice-0-6/NEWS	Mon Jul 28 02:20:03 2008
@@ -9,6 +9,7 @@
 
 Morten:
 	* Work around valgrind bug.
+	* Fix date format problem.  [#545016]
 
 Rob Staudinger:
 	* Use plain menu items for toolbar overflow image menu item proxies, 

Modified: branches/goffice-0-6/goffice/utils/go-format.c
==============================================================================
--- branches/goffice-0-6/goffice/utils/go-format.c	(original)
+++ branches/goffice-0-6/goffice/utils/go-format.c	Mon Jul 28 02:20:03 2008
@@ -361,10 +361,10 @@
 	case GO_FMT_NUMBER:
 		if (fmt->u.number.is_general)
 			return GO_FORMAT_GENERAL;
-		if (fmt->u.number.has_time)
-			return GO_FORMAT_TIME;
 		if (fmt->u.number.has_date)
 			return GO_FORMAT_DATE;
+		if (fmt->u.number.has_time)
+			return GO_FORMAT_TIME;
 		if (fmt->u.number.fraction)
 			return GO_FORMAT_FRACTION;
 		if (fmt->u.number.E_format)