Huw Davies : riched20: Don't split the paragraph at the first \intbl.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 218225548a212e4ece157f93439fbcef3e28ef77
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=218225548a212e4ece157f93439fbcef3e28ef77

Author: Huw Davies <huw at codeweavers.com>
Date:   Tue Oct 20 12:50:38 2020 +0100

riched20: Don't split the paragraph at the first \intbl.

The whole of the current paragraph should be included
in the table.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/riched20/editor.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 51a6e33aef4..c91d47302cf 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -658,14 +658,10 @@ void ME_RTFParAttrHook(RTF_Info *info)
           para = para->member.para.next_para;
           para = ME_InsertTableRowStartAtParagraph(info->editor, para);
           tableDef->tableRowStart = para;
-        } else {
-          ME_Cursor cursor;
-          WCHAR endl = '\r';
-          cursor = info->editor->pCursors[0];
-          if (cursor.nOffset || cursor.pRun->member.run.nCharOfs)
-            ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style);
-          tableDef->tableRowStart = ME_InsertTableRowStartFromCursor(info->editor);
         }
+        else
+          tableDef->tableRowStart = ME_InsertTableRowStartAtParagraph( info->editor,
+                                                                       info->editor->pCursors[0].pPara );
         info->nestingLevel = 1;
         info->canInheritInTbl = TRUE;
       }