… | |
… | |
664 | psiconv_progress(lev+3,off+len,"Going to read cell %d",i); |
664 | psiconv_progress(lev+3,off+len,"Going to read cell %d",i); |
665 | if ((res = psiconv_parse_sheet_cell(buf,lev+3,off+len,&leng,&cell))) |
665 | if ((res = psiconv_parse_sheet_cell(buf,lev+3,off+len,&leng,&cell))) |
666 | goto ERROR2; |
666 | goto ERROR2; |
667 | if ((res = psiconv_list_add(*result,cell))) |
667 | if ((res = psiconv_list_add(*result,cell))) |
668 | goto ERROR3; |
668 | goto ERROR3; |
|
|
669 | free(cell); |
669 | len += leng; |
670 | len += leng; |
670 | } |
671 | } |
671 | |
672 | |
672 | if (length) |
673 | if (length) |
673 | *length = len; |
674 | *length = len; |
… | |
… | |
750 | if ((res = psiconv_parse_sheet_worksheet(buf,lev+4,offset,NULL, |
751 | if ((res = psiconv_parse_sheet_worksheet(buf,lev+4,offset,NULL, |
751 | &worksheet))) |
752 | &worksheet))) |
752 | goto ERROR2; |
753 | goto ERROR2; |
753 | if ((res = psiconv_list_add(*result,worksheet))) |
754 | if ((res = psiconv_list_add(*result,worksheet))) |
754 | goto ERROR3; |
755 | goto ERROR3; |
755 | psiconv_free_sheet_worksheet(worksheet); |
756 | free(worksheet); |
756 | } |
757 | } |
757 | |
758 | |
758 | if (length) |
759 | if (length) |
759 | *length = len; |
760 | *length = len; |
760 | |
761 | |