… | |
… | |
87 | (*result)->file = psiconv_texted_file; |
87 | (*result)->file = psiconv_texted_file; |
88 | psiconv_debug(lev+2,off+len,"File is a TextEd file"); |
88 | psiconv_debug(lev+2,off+len,"File is a TextEd file"); |
89 | } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { |
89 | } else if ((*result)->uid3 == PSICONV_ID_SKETCH) { |
90 | (*result)->file = psiconv_sketch_file; |
90 | (*result)->file = psiconv_sketch_file; |
91 | psiconv_debug(lev+2,off+len,"File is a Sketch file"); |
91 | psiconv_debug(lev+2,off+len,"File is a Sketch file"); |
|
|
92 | } else if ((*result)->uid3 == PSICONV_ID_SHEET) { |
|
|
93 | (*result)->file = psiconv_sheet_file; |
|
|
94 | psiconv_debug(lev+2,off+len,"File is a Sheet file"); |
92 | } |
95 | } |
93 | } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { |
96 | } else if ((*result)->uid2 == PSICONV_ID_MBM_FILE) { |
94 | (*result)->file = psiconv_mbm_file; |
97 | (*result)->file = psiconv_mbm_file; |
95 | if ((*result)->uid3 != 0x00) |
98 | if ((*result)->uid3 != 0x00) |
96 | psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); |
99 | psiconv_warn(lev+2,off+len,"UID3 set in MBM file?!?"); |
97 | psiconv_debug(lev+2,off+len,"File is a MBM file"); |
100 | psiconv_debug(lev+2,off+len,"File is a MBM file"); |
… | |
… | |
822 | { |
825 | { |
823 | return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); |
826 | return psiconv_parse_layout_section(buf,lev,off,length,result,styles,1); |
824 | } |
827 | } |
825 | |
828 | |
826 | int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, |
829 | int psiconv_parse_styleless_layout_section(const psiconv_buffer buf, |
827 | int lev,psiconv_u32 off, |
830 | int lev,psiconv_u32 off, |
828 | int *length, |
831 | int *length, |
829 | psiconv_text_and_layout result, |
832 | psiconv_text_and_layout result, |
830 | psiconv_character_layout base_char, |
833 | const psiconv_character_layout base_char, |
831 | psiconv_paragraph_layout base_para) |
834 | const psiconv_paragraph_layout base_para) |
832 | { |
835 | { |
833 | int res = 0; |
836 | int res = 0; |
834 | psiconv_word_styles_section styles_section; |
837 | psiconv_word_styles_section styles_section; |
835 | |
838 | |
836 | if (!(styles_section = malloc(sizeof(*styles_section)))) |
839 | if (!(styles_section = malloc(sizeof(*styles_section)))) |