… | |
… | |
449 | "in paragraph layout codes list"); |
449 | "in paragraph layout codes list"); |
450 | result->justify_ver = psiconv_justify_bottom; |
450 | result->justify_ver = psiconv_justify_bottom; |
451 | } |
451 | } |
452 | psiconv_debug(lev+3,off+len,"Justify: %02x",temp); |
452 | psiconv_debug(lev+3,off+len,"Justify: %02x",temp); |
453 | len ++; |
453 | len ++; |
|
|
454 | break; |
454 | case 0x07: |
455 | case 0x07: |
455 | psiconv_progress(lev+3,off+len,"Going to read linespacing distance"); |
456 | psiconv_progress(lev+3,off+len,"Going to read linespacing distance"); |
456 | result->linespacing = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
457 | result->linespacing = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
457 | if (res) |
458 | if (res) |
458 | goto ERROR1; |
459 | goto ERROR1; |
… | |
… | |
502 | break; |
503 | break; |
503 | case 0x0e: |
504 | case 0x0e: |
504 | psiconv_progress(lev+3,off+len,"Going to read no widow protection"); |
505 | psiconv_progress(lev+3,off+len,"Going to read no widow protection"); |
505 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
506 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
506 | &result->no_widow_protection))) |
507 | &result->no_widow_protection))) |
|
|
508 | goto ERROR1; |
|
|
509 | len += leng; |
|
|
510 | break; |
|
|
511 | case 0x0f: |
|
|
512 | psiconv_progress(lev+3,off+len,"Going to read wrap to fit cell limits"); |
|
|
513 | if ((res = psiconv_parse_bool(buf,lev+3,off+len,&leng, |
|
|
514 | &result->wrap_to_fit_cell))) |
507 | goto ERROR1; |
515 | goto ERROR1; |
508 | len += leng; |
516 | len += leng; |
509 | break; |
517 | break; |
510 | case 0x10: |
518 | case 0x10: |
511 | psiconv_progress(lev+3,off+len,"Going to read border distance to text"); |
519 | psiconv_progress(lev+3,off+len,"Going to read border distance to text"); |
… | |
… | |
641 | if (res) |
649 | if (res) |
642 | goto ERROR1; |
650 | goto ERROR1; |
643 | psiconv_debug(lev+3,off+len,"Id: %02x",id); |
651 | psiconv_debug(lev+3,off+len,"Id: %02x",id); |
644 | len ++; |
652 | len ++; |
645 | switch(id) { |
653 | switch(id) { |
|
|
654 | case 0x18: |
|
|
655 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
656 | len ++; |
|
|
657 | break; |
646 | case 0x19: |
658 | case 0x19: |
647 | psiconv_progress(lev+3,off+len,"Going to read text color"); |
659 | psiconv_progress(lev+3,off+len,"Going to read text color"); |
648 | if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) |
660 | if ((res = psiconv_parse_color(buf,lev+3,off+len, &leng,&temp_color))) |
649 | goto ERROR1; |
661 | goto ERROR1; |
650 | psiconv_free_color(result->color); |
662 | psiconv_free_color(result->color); |
… | |
… | |
656 | if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) |
668 | if ((res = psiconv_parse_color(buf,lev+2,off+len, &leng,&temp_color))) |
657 | goto ERROR1; |
669 | goto ERROR1; |
658 | psiconv_free_color(result->back_color); |
670 | psiconv_free_color(result->back_color); |
659 | result->back_color = temp_color; |
671 | result->back_color = temp_color; |
660 | len += leng; |
672 | len += leng; |
|
|
673 | break; |
|
|
674 | case 0x1b: |
|
|
675 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
676 | len ++; |
661 | break; |
677 | break; |
662 | case 0x1c: |
678 | case 0x1c: |
663 | psiconv_progress(lev+3,off+len,"Going to read font size"); |
679 | psiconv_progress(lev+3,off+len,"Going to read font size"); |
664 | result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
680 | result->font_size = psiconv_read_size(buf,lev+3,off+len,&leng,&res); |
665 | if (res) |
681 | if (res) |
… | |
… | |
716 | goto ERROR1; |
732 | goto ERROR1; |
717 | psiconv_free_font(result->font); |
733 | psiconv_free_font(result->font); |
718 | result->font = temp_font; |
734 | result->font = temp_font; |
719 | len += leng; |
735 | len += leng; |
720 | break; |
736 | break; |
|
|
737 | case 0x23: |
|
|
738 | psiconv_progress(lev+3,off+len,"Going to skip an unknown setting"); |
|
|
739 | len ++; |
|
|
740 | break; |
721 | case 0x24: |
741 | case 0x24: |
722 | psiconv_progress(lev+3,off+len, |
742 | psiconv_progress(lev+3,off+len, |
723 | "Going to read unknown code 0x24 (%02x expected)", 0); |
743 | "Going to read unknown code 0x24 (%02x expected)", 0); |
724 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
744 | temp = psiconv_read_u8(buf,lev+3,off+len,&res); |
725 | if (res) |
745 | if (res) |