… | |
… | |
63 | psiconv_bool_false, /* italic */ |
63 | psiconv_bool_false, /* italic */ |
64 | psiconv_bool_false, /* bold */ |
64 | psiconv_bool_false, /* bold */ |
65 | psiconv_normalscript, /* super_sub */ |
65 | psiconv_normalscript, /* super_sub */ |
66 | psiconv_bool_false, /* underline */ |
66 | psiconv_bool_false, /* underline */ |
67 | psiconv_bool_false, /* strike_out */ |
67 | psiconv_bool_false, /* strike_out */ |
68 | NULL, /* font */ |
68 | &font, /* font */ |
69 | }; |
69 | }; |
70 | |
70 | |
71 | return psiconv_clone_character_layout(&cl); |
71 | return psiconv_clone_character_layout(&cl); |
72 | } |
72 | } |
73 | |
73 | |
… | |
… | |
495 | psiconv_free_pictures(file->sections); |
495 | psiconv_free_pictures(file->sections); |
496 | free(file); |
496 | free(file); |
497 | } |
497 | } |
498 | } |
498 | } |
499 | |
499 | |
|
|
500 | void psiconv_free_sketch_section(psiconv_sketch_section sec) |
|
|
501 | { |
|
|
502 | if (sec) { |
|
|
503 | psiconv_free_paint_data_section(sec->picture); |
|
|
504 | free(sec); |
|
|
505 | } |
|
|
506 | } |
|
|
507 | |
|
|
508 | void psiconv_free_sketch_f(psiconv_sketch_f file) |
|
|
509 | { |
|
|
510 | if (file) { |
|
|
511 | psiconv_free_sketch_section(file->sketch_sec); |
|
|
512 | free(file); |
|
|
513 | } |
|
|
514 | } |
|
|
515 | |
500 | void psiconv_free_file(psiconv_file file) |
516 | void psiconv_free_file(psiconv_file file) |
501 | { |
517 | { |
502 | if (file) { |
518 | if (file) { |
503 | if (file->type == psiconv_word_file) |
519 | if (file->type == psiconv_word_file) |
504 | psiconv_free_word_f((psiconv_word_f) file->file); |
520 | psiconv_free_word_f((psiconv_word_f) file->file); |
505 | else if (file->type == psiconv_texted_file) |
521 | else if (file->type == psiconv_texted_file) |
506 | psiconv_free_texted_f((psiconv_texted_f) file->file); |
522 | psiconv_free_texted_f((psiconv_texted_f) file->file); |
507 | else if (file->type == psiconv_mbm_file) |
523 | else if (file->type == psiconv_mbm_file) |
508 | psiconv_free_mbm_f((psiconv_mbm_f) file->file); |
524 | psiconv_free_mbm_f((psiconv_mbm_f) file->file); |
|
|
525 | else if (file->type == psiconv_sketch_file) |
|
|
526 | psiconv_free_sketch_f((psiconv_sketch_f) file->file); |
509 | free(file); |
527 | free(file); |
510 | } |
528 | } |
511 | } |
529 | } |