[gnumeric] Fix ODF import of certain percentage formats. [Debian #642135]

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

commit 8afbbfaefd66fe431b267b05b3b067d1a71e7812
Author: Mikko Rasa <tdb tdb fi>
Date:   Thu Sep 22 17:04:54 2011 -0600

    Fix ODF import of certain percentage formats. [Debian #642135]
    
    2011-09-22  Andreas J. Guelzow <aguelzow pyrshep ca>
    	for Mikko Rasa <tdb tdb fi>:
    
    	* openoffice-read.c (oo_date_text_end): fix potential for
    	infinite loop

 NEWS                                 |    3 +++
 plugins/openoffice/ChangeLog         |    6 ++++++
 plugins/openoffice/openoffice-read.c |    2 +-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 48f8943..2d520fd 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,9 @@ Jean:
 	* Fixed labels vertical alignment in preferences dialog. [#658639]
 	* Fixed autofilter user interface issues. [#657036]
 
+Mikko Rasa:
+        * Fix ODF import of certain percentage formats. [Debian #642135]
+
 Morten:
 	* Fix crash.  [#658140]
 	* Fix stf import crash.  [#658982]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 6077007..e91c458 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-06  Andreas J. Guelzow <aguelzow pyrshep ca>
+	for Mikko Rasa <tdb tdb fi>:
+	
+	* openoffice-read.c (oo_date_text_end): fix potential for
+	infinite loop
+
 2011-09-06  Jean Brefort  <jean brefort normalesup org>
 
 	* openoffice-write.c (odf_write_regression_curve): fixed criticals.
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index d1531f6..3108303 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -3849,7 +3849,7 @@ oo_date_text_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
 			int len = xin->content->len;
 			char const *text = xin->content->str;
 			char const *percent_sign;
-			while ((percent_sign = strchr (xin->content->str, '%')) != NULL) {
+			while ((percent_sign = strchr (text, '%')) != NULL) {
 				if (percent_sign > text) {
 					oo_date_text_end_append
 						(state->cur_format.accum, text,