Commit fbbff099 authored by Andreas J. Guelzow 's avatar Andreas J. Guelzow

Try to retain the image names while round tripping through ODF

2015-04-11  Andreas J. Guelzow <aguelzow@pyrshep.ca>

	* src/sheet-object-image.c (gnm_soi_assign_to_sheet): if there is no
	sheet object name, try the image name.
parent a6f1265d
2015-04-11 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/sheet-object-image.c (gnm_soi_assign_to_sheet): if there is no
sheet object name, try the image name.
2015-04-11 Morten Welinder <terra@gnome.org>
* src/sf-dpq.c (dnorm): Improve accuracy in certain far-tail cases.
......
......@@ -494,7 +494,10 @@ gnm_soi_assign_to_sheet (SheetObject *so, Sheet *sheet)
if (soi->image/* && !go_image_get_name (soi->image)*/) {
GODoc *doc = GO_DOC (sheet->workbook);
GOImage *image = go_doc_add_image (doc, soi->name, soi->image);
GOImage *image = go_doc_add_image
(doc,
(soi->name != NULL) ? soi->name : go_image_get_name (soi->image),
soi->image);
if (soi->image != image) {
g_object_unref (soi->image);
soi->image = g_object_ref (image);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment