goffice r2159 - in trunk: . goffice/utils

[mortenw svn gnome org]

Author: mortenw
Date: Mon Jul 28 02:19:27 2008
New Revision: 2159
URL: http://svn.gnome.org/viewvc/goffice?rev=2159&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:
   trunk/ChangeLog
   trunk/NEWS
   trunk/goffice/utils/go-format.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jul 28 02:19:27 2008
@@ -13,6 +13,7 @@
 
 Morten:
 	* Work around valgrind bug.
+	* Fix date format problem.  [#545016]
 
 --------------------------------------------------------------------------
 goffice 0.7.0:

Modified: trunk/goffice/utils/go-format.c
==============================================================================
--- trunk/goffice/utils/go-format.c	(original)
+++ trunk/goffice/utils/go-format.c	Mon Jul 28 02:19:27 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)