--- psiconv/trunk/lib/psiconv/data.c 2001/07/25 11:49:59 134 +++ psiconv/trunk/lib/psiconv/data.c 2003/11/19 21:04:06 159 @@ -24,6 +24,10 @@ #include "data.h" #include "list.h" +#ifdef DMALLOC +#include +#endif + static psiconv_color clone_color(psiconv_color color); static psiconv_font clone_font(psiconv_font font); static psiconv_border clone_border(psiconv_border border); @@ -440,6 +444,7 @@ psiconv_free_word_style(styles->normal); if (styles->styles) psiconv_list_free_el(styles->styles,psiconv_free_style_aux); + free(styles); } } @@ -470,9 +475,35 @@ } } +void psiconv_free_object_icon_section(psiconv_object_icon_section section) +{ + if (section) { + if (section->icon_name) + free(section->icon_name); + free(section); + } +} + +void psiconv_free_object_display_section(psiconv_object_display_section section) +{ + if (section) + free(section); +} + +void psiconv_free_object(psiconv_object object) +{ + if (object) { + psiconv_free_object_icon_section(object->icon); + psiconv_free_object_display_section(object->display); + psiconv_free_file(object->object); + free(object); + } +} + void psiconv_free_in_line_layout_aux(void * layout) { psiconv_free_character_layout(((psiconv_in_line_layout) layout)->layout); + psiconv_free_object(((psiconv_in_line_layout) layout)->object); } void psiconv_free_in_line_layout(psiconv_in_line_layout layout)