ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

riched20: Pass a paragraph ptr to the table update flags function. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2020-10-16 12:08:06 +01:00 committed by Alexandre Julliard
parent 18d1b2453f
commit 77f1894f21
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/riched20/para.c
View File

@ -211,23 +211,20 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor)
ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast); ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast);
} }
static void ME_UpdateTableFlags(ME_DisplayItem *para) static void table_update_flags( ME_Paragraph *para )
{ {
para->member.para.fmt.dwMask |= PFM_TABLE|PFM_TABLEROWDELIMITER; para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER;
if (para->member.para.pCell) {
para->member.para.nFlags |= MEPF_CELL; if (para->pCell) para->nFlags |= MEPF_CELL;
} else { else para->nFlags &= ~MEPF_CELL;
para->member.para.nFlags &= ~MEPF_CELL;
} if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER;
if (para->member.para.nFlags & MEPF_ROWEND) { else para->fmt.wEffects &= ~PFE_TABLEROWDELIMITER;
para->member.para.fmt.wEffects |= PFE_TABLEROWDELIMITER;
} else { if (para->nFlags & (MEPF_ROWSTART | MEPF_CELL | MEPF_ROWEND))
para->member.para.fmt.wEffects &= ~PFE_TABLEROWDELIMITER; para->fmt.wEffects |= PFE_TABLE;
}
if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND))
para->member.para.fmt.wEffects |= PFE_TABLE;
else else
para->member.para.fmt.wEffects &= ~PFE_TABLE; para->fmt.wEffects &= ~PFE_TABLE;
} }
static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base ) static inline BOOL para_num_same_list( const PARAFORMAT2 *item, const PARAFORMAT2 *base )
@ -638,8 +635,8 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run,
} else { } else {
new_para->member.para.pCell = run_para->member.para.pCell; new_para->member.para.pCell = run_para->member.para.pCell;
} }
ME_UpdateTableFlags(run_para); table_update_flags( &run_para->member.para );
ME_UpdateTableFlags(new_para); table_update_flags( &new_para->member.para );
} }
/* force rewrap of the */ /* force rewrap of the */