Commit 469e82ee authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

accept NULL attrBags.

2001-09-27  Jody Goldberg <jgoldberg@home.com>

	* ms-obj.c (ms_object_attr_bag_lookup) : accept NULL attrBags.

	* ms-escher.c (ms_escher_read_OPT) : oops lost the blip id.
parent 7de6364f
2001-09-27 Jody Goldberg <jgoldberg@home.com>
* ms-obj.c (ms_object_attr_bag_lookup) : accept NULL attrBags.
* ms-escher.c (ms_escher_read_OPT) : oops lost the blip id.
2001-09-27 Jody Goldberg <jgoldberg@home.com>
* ms-excel-read.c (ms_excel_wb_get_fmt) : renamed something
......
......@@ -1258,7 +1258,7 @@ ms_escher_read_OPT (MSEscherState *state, MSEscherHeader *h)
case 259 : name = "fixed16_16 cropFromRight"; break;
/* NULL : Blip to display */
case 260 :
case 260 : id = MS_OBJ_ATTR_BLIP_ID;
name = "Blip * pib";
break;
......
......@@ -144,9 +144,12 @@ ms_object_attr_bag_insert (MSObjAttrBag *attrs, MSObjAttr *attr)
MSObjAttr *
ms_object_attr_bag_lookup (MSObjAttrBag *attrs, MSObjAttrID id)
{
MSObjAttr attr;
*((MSObjAttrID *)&(attr.id)) = id;
return g_hash_table_lookup (attrs, &attr);
if (attrs != NULL) {
MSObjAttr attr;
*((MSObjAttrID *)&(attr.id)) = id;
return g_hash_table_lookup (attrs, &attr);
}
return NULL;
}
/********************************************************************************/
......
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