--- psiconv/trunk/lib/psiconv/data.h 2001/07/10 22:38:49 125 +++ psiconv/trunk/lib/psiconv/data.h 2003/11/20 22:14:43 160 @@ -34,6 +34,9 @@ extern "C" { #endif /* __cplusplus */ +/* Forward declaration (for psiconv_object) */ +typedef struct psiconv_file_s *psiconv_file; + typedef double psiconv_float_t; typedef enum psiconv_file_type { @@ -227,10 +230,35 @@ psiconv_string_t name; } *psiconv_application_id_section; +typedef struct psiconv_object_icon_section_s +{ + psiconv_length_t icon_width; + psiconv_length_t icon_height; + psiconv_string_t icon_name; +} *psiconv_object_icon_section; + +typedef struct psiconv_object_display_section_s +{ + psiconv_bool_t show_icon; + psiconv_length_t width; + psiconv_length_t height; +} *psiconv_object_display_section; + +typedef struct psiconv_object_s +{ + psiconv_object_icon_section icon; + psiconv_object_display_section display; + psiconv_file object; +} *psiconv_object; + typedef struct psiconv_in_line_layout_s { psiconv_character_layout layout; int length; + /* If object is NULL, this does not apply to an object */ + psiconv_object object; + psiconv_length_t object_width; + psiconv_length_t object_height; } *psiconv_in_line_layout; typedef psiconv_list psiconv_in_line_layouts; /* of struct in_line_layout */ @@ -504,8 +532,8 @@ psiconv_u32 dat_int; double dat_float; char *dat_string; - psiconv_bool_t dat_bool; - psiconv_sheet_errorcode_t dat_error; + psiconv_bool_t dat_bool; + psiconv_sheet_errorcode_t dat_error; } data; psiconv_sheet_cell_layout layout; psiconv_bool_t calculated; @@ -513,7 +541,6 @@ } *psiconv_sheet_cell; typedef psiconv_list psiconv_sheet_cell_list; - /* Of struct psiconv_sheet_cell_s */ typedef struct psiconv_sheet_status_section_s { @@ -680,23 +707,111 @@ psiconv_sheet_cell_reference_t dat_cellref; psiconv_sheet_cell_block_t dat_cellblock; psiconv_formula_list fun_operands; + psiconv_u32 dat_variable; } data; } *psiconv_formula; +typedef struct psiconv_sheet_line_s +{ + psiconv_u32 position; + psiconv_sheet_cell_layout layout; +} *psiconv_sheet_line; + +typedef psiconv_list psiconv_sheet_line_list; + /* Of struct psiconv_sheet_line_s */ + +typedef struct psiconv_sheet_grid_size_s +{ + psiconv_u32 line_number; + psiconv_length_t size; +} *psiconv_sheet_grid_size; + +typedef psiconv_list psiconv_sheet_grid_size_list; + /* Of struct psiconv_sheet_grid_size_s */ + +typedef psiconv_list psiconv_sheet_grid_break_list; /* of psiconv_u32 */ + +typedef struct psiconv_sheet_grid_section_s +{ + psiconv_bool_t show_column_titles; + psiconv_bool_t show_row_titles; + psiconv_bool_t show_vertical_grid; + psiconv_bool_t show_horizontal_grid; + psiconv_bool_t freeze_rows; + psiconv_bool_t freeze_columns; + psiconv_u32 frozen_rows; + psiconv_u32 frozen_columns; + psiconv_u32 first_unfrozen_row_displayed; + psiconv_u32 first_unfrozen_column_displayed; + psiconv_bool_t show_page_breaks; + psiconv_u32 first_row; + psiconv_u32 first_column; + psiconv_u32 last_row; + psiconv_u32 last_column; + psiconv_length_t default_row_height; + psiconv_length_t default_column_width; + psiconv_sheet_grid_size_list row_heights; + psiconv_sheet_grid_size_list column_heights; + psiconv_sheet_grid_break_list row_page_breaks; + psiconv_sheet_grid_break_list column_page_breaks; +} *psiconv_sheet_grid_section; + typedef struct psiconv_sheet_worksheet_s { psiconv_sheet_cell_layout default_layout; psiconv_sheet_cell_list cells; psiconv_bool_t show_zeros; + psiconv_sheet_line_list row_default_layouts; + psiconv_sheet_line_list col_default_layouts; + psiconv_sheet_grid_section grid; } *psiconv_sheet_worksheet; typedef psiconv_list psiconv_sheet_worksheet_list; - /* of struct psiconv_sheet_worksheet */ + /* of struct psiconv_sheet_worksheet_s */ + +typedef enum psiconv_variable_type +{ + psiconv_var_int, + psiconv_var_float, + psiconv_var_string, + psiconv_var_cellref, + psiconv_var_cellblock +} psiconv_variable_type_t; + +typedef struct psiconv_sheet_variable_s +{ + psiconv_u32 number; + char *name; + psiconv_variable_type_t type; + union { + psiconv_s32 dat_int; + double dat_float; + char *dat_string; + psiconv_sheet_cell_reference_t dat_cellref; + psiconv_sheet_cell_block_t dat_cellblock; + } data; +} *psiconv_sheet_variable; + +typedef psiconv_list psiconv_sheet_variable_list; + /* of struct psiconv_sheet_variable_s */ + +typedef struct psiconv_sheet_name_section_s +{ + char *name; +} *psiconv_sheet_name_section; + +typedef struct psiconv_sheet_info_section_s +{ + psiconv_bool_t auto_recalc; +} *psiconv_sheet_info_section; typedef struct psiconv_sheet_workbook_section_s { psiconv_formula_list formulas; psiconv_sheet_worksheet_list worksheets; + psiconv_sheet_variable_list variables; + psiconv_sheet_info_section info; + psiconv_sheet_name_section name; } *psiconv_sheet_workbook_section; typedef struct psiconv_sheet_f_s @@ -706,11 +821,12 @@ psiconv_sheet_workbook_section workbook_sec; } *psiconv_sheet_f; -typedef struct psiconv_file_s +/* NB: psiconv_file is already defined above */ +struct psiconv_file_s { psiconv_file_type_t type; void *file; -} *psiconv_file; +}; /* UID1 */ @@ -749,6 +865,10 @@ #define PSICONV_ID_STYLE_REMOVABLE 0x1000004F #define PSICONV_ID_STYLE_BUILT_IN 0x1000004C #define PSICONV_ID_CLIPART_ITEM 0x10000040 +#define PSICONV_ID_OBJECT 0x10000051 +#define PSICONV_ID_OBJECT_DISPLAY_SECTION 0x10000146 +#define PSICONV_ID_OBJECT_ICON_SECTION 0x1000012A +#define PSICONV_ID_OBJECT_SECTION_TABLE_SECTION 0x10000144 /* Return a clean layout_status. You can modify it at will. Returns NULL @@ -769,8 +889,16 @@ /* Get a numbered style. Returns NULL if the style is unknown. */ extern psiconv_word_style psiconv_get_style (psiconv_word_styles_section ss, int nr); +/* Get a numbered formula. Returns NULL if the style is unknown. */ extern psiconv_formula psiconv_get_formula (psiconv_formula_list ss, int nr); +/* Return the default layout */ +extern psiconv_sheet_cell_layout psiconv_get_default_layout + (psiconv_sheet_line_list row_defaults, + psiconv_sheet_line_list col_defaults, + psiconv_sheet_cell_layout cell_default, + int row,int col); + extern void psiconv_free_color(psiconv_color color); extern void psiconv_free_border(psiconv_border border); extern void psiconv_free_bullet(psiconv_bullet bullet); @@ -787,6 +915,12 @@ extern void psiconv_free_sheet_status_section (psiconv_sheet_status_section section); extern void psiconv_free_sheet_cell_layout(psiconv_sheet_cell_layout layout); +extern void psiconv_free_sheet_grid_break_list + (psiconv_sheet_grid_break_list list); +extern void psiconv_free_sheet_grid_size(psiconv_sheet_grid_size s); +extern void psiconv_free_sheet_grid_size_list + (psiconv_sheet_grid_size_list list); +extern void psiconv_free_sheet_grid_section(psiconv_sheet_grid_section sec); extern void psiconv_free_sheet_worksheet(psiconv_sheet_worksheet sheet); extern void psiconv_free_sheet_worksheet_list (psiconv_sheet_worksheet_list list); @@ -796,12 +930,23 @@ extern void psiconv_free_sheet_cell_list(psiconv_sheet_cell_list list); extern void psiconv_free_sheet_numberformat (psiconv_sheet_numberformat numberformat); +extern void psiconv_free_sheet_line_list(psiconv_sheet_line_list list); +extern void psiconv_free_sheet_line(psiconv_sheet_line line); +extern void psiconv_free_sheet_name_section(psiconv_sheet_name_section section); +extern void psiconv_free_sheet_variable(psiconv_sheet_variable list); +extern void psiconv_free_sheet_variable_list(psiconv_sheet_variable_list list); +extern void psiconv_free_sheet_info_section(psiconv_sheet_info_section section); extern void psiconv_free_header_section(psiconv_header_section header); extern void psiconv_free_section_table_entry(psiconv_section_table_entry entry); extern void psiconv_free_section_table_section (psiconv_section_table_section section); extern void psiconv_free_application_id_section (psiconv_application_id_section section); +extern void psiconv_free_object_display_section + (psiconv_object_display_section section); +extern void psiconv_free_object_icon_section + (psiconv_object_icon_section section); +extern void psiconv_free_object(psiconv_object object); extern void psiconv_free_in_line_layout(psiconv_in_line_layout layout); extern void psiconv_free_in_line_layouts(psiconv_in_line_layouts layouts); extern void psiconv_free_replacement(psiconv_replacement replacement);