[gnumeric] ods: roundtrip fix.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] ods: roundtrip fix.
- Date: Mon, 17 Feb 2014 01:12:15 +0000 (UTC)
commit d7e70e408f731d5e9b848bc544837fda306315db
Author: Morten Welinder <terra gnome org>
Date: Sun Feb 16 20:11:44 2014 -0500
ods: roundtrip fix.
Commiting for Andreas.
NEWS | 3 +++
plugins/openoffice/ChangeLog | 10 ++++++++++
plugins/openoffice/openoffice-read.c | 20 ++++++++++----------
3 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/NEWS b/NEWS
index a5ff7ee..0745679 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
Gnumeric 1.12.12
+Andreas:
+ * Fix ODF roundtrip of some header/footer markers. [part of #724487]
+
Jean:
* Fix persistence of hyperlinks tips. [see #724108]
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index d8fc931..76fcc16 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-16 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * openoffice-read.c (odf_hf_sheet_name): fix capitalization
+ (odf_hf_date): ditto
+ (odf_hf_time): ditto
+ (odf_hf_page_number): ditto
+ (odf_hf_page_count): ditto
+ (odf_hf_file): ditto
+ (odf_hf_title): ditto
+
2014-02-16 Morten Welinder <terra gnome org>
* Release 1.12.11
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 306be29..b255f5a 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -5811,7 +5811,7 @@ static void
odf_hf_sheet_name (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
{
odf_hf_item_start (xin);
- odf_hf_item (xin, _("tab"));
+ odf_hf_item (xin, _("TAB"));
}
static void
@@ -5843,28 +5843,28 @@ static void
odf_hf_date (GsfXMLIn *xin, xmlChar const **attrs)
{
odf_hf_item_start (xin);
- odf_hf_item_w_data_style (xin, attrs, _("date"));
+ odf_hf_item_w_data_style (xin, attrs, _("DATE"));
}
static void
odf_hf_time (GsfXMLIn *xin, xmlChar const **attrs)
{
odf_hf_item_start (xin);
- odf_hf_item_w_data_style (xin, attrs, _("time"));
+ odf_hf_item_w_data_style (xin, attrs, _("TIME"));
}
static void
odf_hf_page_number (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
{
odf_hf_item_start (xin);
- odf_hf_item (xin, _("page"));
+ odf_hf_item (xin, _("PAGE"));
}
static void
odf_hf_page_count (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
{
odf_hf_item_start (xin);
- odf_hf_item (xin, _("pages"));
+ odf_hf_item (xin, _("PAGES"));
}
static void
@@ -5889,16 +5889,16 @@ odf_hf_file (GsfXMLIn *xin, xmlChar const **attrs)
odf_hf_item_start (xin);
switch (tmp) {
case 0:
- odf_hf_item (xin, _("path"));
+ odf_hf_item (xin, _("PATH"));
odf_text_p_add_text (state, "/");
- odf_hf_item (xin, _("file"));
+ odf_hf_item (xin, _("FILE"));
break;
case 1:
- odf_hf_item (xin, _("path"));
+ odf_hf_item (xin, _("PATH"));
break;
default:
case 2:
- odf_hf_item (xin, _("file"));
+ odf_hf_item (xin, _("FILE"));
break;
}
}
@@ -5942,7 +5942,7 @@ static void
odf_hf_title (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
{
odf_hf_item_start (xin);
- odf_hf_item (xin, _("title"));
+ odf_hf_item (xin, _("TITLE"));
}
/*****************************************************************************************************/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]