From c8fef268846221fa161d920c10c2b8290b64b476 Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Wed, 4 Nov 2020 06:56:25 +0000 Subject: [PATCH] riched20: Use para_in_table() instead of IsInTable(). Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/riched20/editor.h | 1 - dlls/riched20/table.c | 17 ++--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e884cbee2f3..05a6a7ee37f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -289,7 +289,6 @@ ME_Paragraph *editor_end_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; ME_Paragraph *editor_first_para( ME_TextEditor *editor ) DECLSPEC_HIDDEN; /* table.c */ -BOOL ME_IsInTable(ME_DisplayItem *pItem) DECLSPEC_HIDDEN; ME_Paragraph *cell_end_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Paragraph *cell_first_para( ME_Cell *cell ) DECLSPEC_HIDDEN; ME_Cell *cell_next( ME_Cell *cell ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index e08876d29bd..9d0d24fa1c3 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -212,19 +212,6 @@ ME_Paragraph *cell_end_para( ME_Cell *cell ) return &ME_FindItemBack( cell_get_di( next ), diParagraph )->member.para; } -BOOL ME_IsInTable(ME_DisplayItem *pItem) -{ - PARAFORMAT2 *pFmt; - if (!pItem) - return FALSE; - if (pItem->type == diRun) - pItem = ME_GetParagraph(pItem); - if (pItem->type != diParagraph) - return FALSE; - pFmt = &pItem->member.para.fmt; - return pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE; -} - /* Table rows should either be deleted completely or not at all. */ void table_protect_partial_deletion( ME_TextEditor *editor, ME_Cursor *c, int *num_chars ) { @@ -504,7 +491,7 @@ void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) } if (!editor->bEmulateVersion10) /* v4.1 */ { - if (!ME_IsInTable(toCursor.pRun)) + if (!para_in_table( &toCursor.pPara->member.para )) { editor->pCursors[0] = toCursor; editor->pCursors[1] = toCursor; @@ -513,7 +500,7 @@ void table_handle_tab( ME_TextEditor *editor, BOOL selected_row ) } else /* v1.0 - 3.0 */ { - if (!ME_IsInTable(fromCursor.pRun)) + if (!para_in_table( &fromCursor.pPara->member.para) ) { editor->pCursors[0] = fromCursor; editor->pCursors[1] = fromCursor;