Commit 887d7e68 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

riched20: Use the paragraph and run helpers in the delete text function.

parent 35f5e651
...@@ -333,18 +333,18 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, ...@@ -333,18 +333,18 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start,
{ {
/* We aren't deleting anything in this run, so we will go back to the /* We aren't deleting anything in this run, so we will go back to the
* last run we are deleting text in. */ * last run we are deleting text in. */
ME_PrevRun(&c.pPara, &c.pRun, TRUE); c.pRun = run_get_di( run_prev_all_paras( &c.pRun->member.run ) );
c.pPara = para_get_di( c.pRun->member.run.para );
c.nOffset = c.pRun->member.run.len; c.nOffset = c.pRun->member.run.len;
} }
run = &c.pRun->member.run; run = &c.pRun->member.run;
if (run->nFlags & MERF_ENDPARA) { if (run->nFlags & MERF_ENDPARA)
{
int eollen = c.pRun->member.run.len; int eollen = c.pRun->member.run.len;
BOOL keepFirstParaFormat; BOOL keepFirstParaFormat;
if (!ME_FindItemFwd(c.pRun, diParagraph)) if (!para_next( para_next( &c.pPara->member.para ) )) return TRUE;
{
return TRUE;
}
keepFirstParaFormat = (totalChars == nChars && nChars <= eollen && keepFirstParaFormat = (totalChars == nChars && nChars <= eollen &&
run->nCharOfs); run->nCharOfs);
if (!editor->bEmulateVersion10) /* v4.1 */ if (!editor->bEmulateVersion10) /* v4.1 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment