[gnumeric] fix ODF import of text:file-name field in headers
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] fix ODF import of text:file-name field in headers
- Date: Fri, 27 Apr 2012 17:10:15 +0000 (UTC)
commit 2e323c7c6ab8d0ac7098080bd5681c52cb2258ef
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Fri Apr 27 11:09:01 2012 -0600
fix ODF import of text:file-name field in headers
2012-04-27 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-read.c (odf_hf_file): use the correct attribute name
plugins/openoffice/ChangeLog | 4 ++++
plugins/openoffice/openoffice-read.c | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 38852f4..3b5896d 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,9 @@
2012-04-27 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * openoffice-read.c (odf_hf_file): use the correct attribute name
+
+2012-04-27 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* openoffice-read.c (odf_header_footer): do not use the cell text
(odf_hf_region_end): new
(odf_hf_region): call odf_push_text_p
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 530ffbf..ba3d335 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -5345,7 +5345,7 @@ odf_hf_page_count (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
static void
odf_hf_file (GsfXMLIn *xin, xmlChar const **attrs)
{
- static OOEnum const dropdown_types [] = {
+ static OOEnum const display_types [] = {
{ "full", 0 },
{ "path", 1 },
{ "name", 2 },
@@ -5360,7 +5360,7 @@ odf_hf_file (GsfXMLIn *xin, xmlChar const **attrs)
return;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
- if (oo_attr_enum (xin, attrs, OO_NS_TABLE, "display-list", dropdown_types, &tmp)) ;
+ if (oo_attr_enum (xin, attrs, OO_NS_TEXT, "display", display_types, &tmp)) ;
switch (tmp) {
case 0:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]