[gnumeric] Fix space handling on ODF import. [Part of #676535]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fix space handling on ODF import. [Part of #676535]
- Date: Tue, 22 May 2012 06:56:57 +0000 (UTC)
commit 631466513a07d4ef0a2997c0059286cf3e1360aa
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Tue May 22 00:56:15 2012 -0600
Fix space handling on ODF import. [Part of #676535]
2012-05-22 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (odf_text_space): default is 1.
NEWS | 1 +
plugins/openoffice/ChangeLog | 6 +++++-
plugins/openoffice/openoffice-read.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 8e41ce1..4c44d40 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Andreas:
* Fix crash on ODF import of messagefree validations.
* Improve ODF import/export of style conditions. [#676289, #676441]
* Fix object placement in ODF import. [#676339]
+ * Fix space handling on ODF import. [Part of #676535]
Jean:
* Fix graph series headers when a multiple selection is used. [#675913]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 347a1f1..a49cd11 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,4 +1,8 @@
-2012-05-21 Andreas J. Guelzow <aguelzow pyrshep ca>
+2012-05-22 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * openoffice-read.c (odf_text_space): default is 1.
+
+2012-05-22 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (oo_cell_content_end): check for NULL GString
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 0631880..6ec14cf 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -1701,7 +1701,7 @@ odf_text_special (GsfXMLIn *xin, int count, char const *sym)
static void
odf_text_space (GsfXMLIn *xin, xmlChar const **attrs)
{
- int count = 0;
+ int count = 1;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (oo_attr_int_range (xin, attrs, OO_NS_TEXT, "c", &count, 0, INT_MAX))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]