[gnumeric] Fix import of multi-paragraph text from ODF. [#704391]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fix import of multi-paragraph text from ODF. [#704391]
- Date: Wed, 17 Jul 2013 19:10:16 +0000 (UTC)
commit eb27ed8d55589d49ecccaa389c22f6d4bed5e0f4
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Wed Jul 17 13:09:14 2013 -0600
Fix import of multi-paragraph text from ODF. [#704391]
2013-07-17 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (odf_text_content_end): reset offset
NEWS | 1 +
plugins/openoffice/ChangeLog | 4 ++++
plugins/openoffice/openoffice-read.c | 1 +
3 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 409d2e1..513c08c 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Gnumeric 1.12.5
Andreas:
* Improve ODF import of cells with links. [#704022]
+ * Fix import of multi-paragraph text from ODF. [#704391]
Morten:
* Fix crazy parsing problem. [#704109] [#704140]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 1578cc9..d18fafc 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-17 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * openoffice-read.c (odf_text_content_end): reset offset
+
2013-07-11 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (opendoc_content_dtd): handle spaces, tabs
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 8b01268..5c25e8e 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -1651,6 +1651,7 @@ odf_text_content_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
if (strlen (xin->content->str) > ptr->offset)
odf_text_p_add_text
(state, xin->content->str + ptr->offset);
+ ptr->offset = 0;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]