[goffice] Fix format string parsing with localized colour names. [#647324]



commit 9fdb0c6f9674662f569c3d3d2100478172bfddb5
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Sat Apr 9 17:50:24 2011 -0600

    Fix format string parsing with localized colour names. [#647324]
    
    2011-04-09  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* goffice/utils/go-format.c (go_format_token2): localized colour
    	names need not start with an alphabetic ascii character.

 ChangeLog                 |    5 +++++
 NEWS                      |    3 +++
 goffice/utils/go-format.c |    5 +----
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d422cae..4319f31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-09  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* goffice/utils/go-format.c (go_format_token2): localized colour
+	names need not start with an alphabetic ascii character.
+
 2011-04-08  Morten Welinder  <terra gnome org>
 
 	* goffice/canvas/goc-group.c: Cleanup list traversal.
diff --git a/NEWS b/NEWS
index 48851c5..dba430b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 goffice 0.8.15:
 
+Andreas:
+	* Fix format string parsing with localized colour names. [#647324]
+
 Jean:
 	* Fixed closed bezier spline evaluation. [#646700]
 	* Implement dropbar plots with linear or logarithmic index axis. [#646832]
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index cf45676..8c87799 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -838,10 +838,7 @@ go_format_token2 (char const **pstr, GOFormatTokenType *ptt, gboolean localized)
 			break;
 
 		default:
-			if (g_ascii_isalpha (str[1]))
-				t = TOK_COLOR;
-			else
-				goto error;
+			t = TOK_COLOR;
 			break;
 		}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]