[gnumeric] Fix image name roundtrip through ODF.
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fix image name roundtrip through ODF.
- Date: Sat, 9 May 2020 06:44:20 +0000 (UTC)
commit c40c638ec5358a9450552dbdfa2f2264d15f4f7c
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Sat May 9 00:43:28 2020 -0600
Fix image name roundtrip through ODF.
2020-05-09 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (odf_write_image): do not write two names
NEWS | 2 +-
plugins/openoffice/ChangeLog | 4 ++++
plugins/openoffice/openoffice-write.c | 8 --------
3 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/NEWS b/NEWS
index b6f6c8e71..7629f844e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
Gnumeric 1.12.47
Andreas:
- * Fix chart name roundtrip through ODF. [#477]
+ * Fix chart and image name roundtrip through ODF. [#477]
* Fix print flag roundtrip for sheet objects through ODF. [#486]
Jean:
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 2dfa4db3f..a811d0623 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-09 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * openoffice-write.c (odf_write_image): do not write two names
+
2020-05-08 Andreas J. Guelzow <aguelzow pyrshep ca>
* openoffice-write.c (odf_write_graph): receive style_name
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index f11386069..61936097b 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -3061,14 +3061,6 @@ odf_write_image (GnmOOExport *state, SheetObject *so, char const *name)
"image", &image,
NULL);
- if (image) {
- /* Write attribute for surrounding draw:frame */
- const char *image_name = go_image_get_name (image);
- if (image_name)
- gsf_xml_out_add_cstr (state->xml, DRAW "name", image_name);
- g_object_unref (image);
- }
-
fullname = g_strdup_printf ("Pictures/%s.%s", name, image_type);
gsf_xml_out_start_element (state->xml, DRAW "image");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]