Huw Davies : riched20: Pass a paragraph ptr to the table update flags function.
Alexandre Julliard
julliard at winehq.org
Fri Oct 16 15:55:38 CDT 2020
Module: wine
Branch: master
Commit: 77f1894f21a872394e3d92872cbf78e705c8b470
URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f1894f21a872394e3d92872cbf78e705c8b470
Author: Huw Davies <huw at codeweavers.com>
Date: Fri Oct 16 12:08:06 2020 +0100
riched20: Pass a paragraph ptr to the table update flags function.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/para.c | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c
index 431f89faed3..2d5072e232e 100644
--- a/dlls/riched20/para.c
+++ b/dlls/riched20/para.c
@@ -211,23 +211,20 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor)
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;
- if (para->member.para.pCell) {
- para->member.para.nFlags |= MEPF_CELL;
- } else {
- para->member.para.nFlags &= ~MEPF_CELL;
- }
- if (para->member.para.nFlags & MEPF_ROWEND) {
- para->member.para.fmt.wEffects |= PFE_TABLEROWDELIMITER;
- } else {
- para->member.para.fmt.wEffects &= ~PFE_TABLEROWDELIMITER;
- }
- if (para->member.para.nFlags & (MEPF_ROWSTART|MEPF_CELL|MEPF_ROWEND))
- para->member.para.fmt.wEffects |= PFE_TABLE;
- else
- para->member.para.fmt.wEffects &= ~PFE_TABLE;
+ para->fmt.dwMask |= PFM_TABLE | PFM_TABLEROWDELIMITER;
+
+ if (para->pCell) para->nFlags |= MEPF_CELL;
+ else para->nFlags &= ~MEPF_CELL;
+
+ if (para->nFlags & MEPF_ROWEND) para->fmt.wEffects |= PFE_TABLEROWDELIMITER;
+ else para->fmt.wEffects &= ~PFE_TABLEROWDELIMITER;
+
+ if (para->nFlags & (MEPF_ROWSTART | MEPF_CELL | MEPF_ROWEND))
+ para->fmt.wEffects |= PFE_TABLE;
+ else
+ para->fmt.wEffects &= ~PFE_TABLE;
}
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 {
new_para->member.para.pCell = run_para->member.para.pCell;
}
- ME_UpdateTableFlags(run_para);
- ME_UpdateTableFlags(new_para);
+ table_update_flags( &run_para->member.para );
+ table_update_flags( &new_para->member.para );
}
/* force rewrap of the */
More information about the wine-cvs
mailing list