richedit: Prevent assertion failure when streaming out nested tables.

The table properties are streamed out at the start of the table for non-nested tables, and at the end of the table for nested tables. The assertion caught the fact that I didn't get the start of the table row for nested tables before trying to stream out the properties. The call to ME_GetTableRowStart will handle both of these cases by getting the table row start paragraph and asserting that it is found. This call was also the reason for removing the const qualifier on one of the parameters.

richedit: Prevent assertion failure when streaming out nested tables.
ee5342e4 · Dylan Smith · Alexandre Julliard · fac8e957 · ee5342e4
Commit ee5342e4 authored Sep 30, 2008 by Dylan Smith Committed by Alexandre Julliard Oct 01, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

writer.c dlls/riched20/writer.c +2 -2

No files found.
--- a/dlls/riched20/writer.c
+++ b/dlls/riched20/writer.c
@@ -286,7 +286,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun,

 static BOOL
 ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream,
-                          const ME_DisplayItem *para)
+                          ME_DisplayItem *para)
 {
  ME_DisplayItem *cell;
  char props[STREAMOUT_BUFFER_SIZE] = "";
@@ -294,7 +294,7 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream,
  if (!ME_StreamOutPrint(pStream, "\\trowd"))
    return FALSE;
  if (!editor->bEmulateVersion10) { /* v4.1 */
-    assert(para->member.para.nFlags & MEPF_ROWSTART);
+    para = ME_GetTableRowStart(para);
    cell = para->member.para.next_para->member.para.pCell;
    assert(cell);
    do {