- if ( spanned_columns == 0 )
- {
- xmlTextWriterStartElement (x->content_wtr, _xml("table:table-cell"));
- xmlTextWriterWriteAttribute (x->content_wtr, _xml("office:value-type"), _xml("string"));
-
- if ( opts & TAB_JOIN )
- {
- struct tab_joined_cell *j = (struct tab_joined_cell*) ss_data (ss);
- spanned_columns = j->x2 - j->x1;
-
- xmlTextWriterWriteFormatAttribute (x->content_wtr,
- _xml("table:number-columns-spanned"),
- "%d", spanned_columns);
- }
-
- xmlTextWriterStartElement (x->content_wtr, _xml("text:p"));
-
- if ( r < tab->t || c < tab->l )
- xmlTextWriterWriteAttribute (x->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading"));
- else
- xmlTextWriterWriteAttribute (x->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents"));
-
- xmlTextWriterWriteString (x->content_wtr, _xml (s));
-
- xmlTextWriterEndElement (x->content_wtr); /* text:p */
- xmlTextWriterEndElement (x->content_wtr); /* table:table-cell */
+ xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-cell"));
+ xmlTextWriterWriteAttribute (odt->content_wtr, _xml("office:value-type"), _xml("string"));
+
+ if (colspan > 1)
+ xmlTextWriterWriteFormatAttribute (
+ odt->content_wtr, _xml("table:number-columns-spanned"),
+ "%d", colspan);
+
+ if (rowspan > 1)
+ xmlTextWriterWriteFormatAttribute (
+ odt->content_wtr, _xml("table:number-rows-spanned"),
+ "%d", rowspan);
+
+ for (i = 0; i < cell.n_contents; i++)
+ {
+ const struct cell_contents *contents = &cell.contents[i];
+ int j;
+
+ if (contents->text)
+ {
+ xmlTextWriterStartElement (odt->content_wtr, _xml("text:p"));
+
+ if ( r < table_ht (tab) || c < table_hl (tab) )
+ xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading"));
+ else
+ xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents"));
+
+ write_xml_with_line_breaks (odt, contents->text);
+
+ for (j = 0; j < contents->n_footnotes; j++)
+ write_footnote (odt, contents->footnotes[j]);
+
+ xmlTextWriterEndElement (odt->content_wtr); /* text:p */
+ }
+ else if (contents->table)
+ write_table (odt, contents->table);
+
+ }
+ xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */