Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
c8fef268
Commit
c8fef268
authored
Nov 04, 2020
by
Huw Davies
Committed by
Alexandre Julliard
Nov 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
riched20: Use para_in_table() instead of IsInTable().
Signed-off-by:
Huw Davies
<
huw@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
507f5170
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
16 deletions
+2
-16
editor.h
dlls/riched20/editor.h
+0
-1
table.c
dlls/riched20/table.c
+2
-15
No files found.
dlls/riched20/editor.h
View file @
c8fef268
...
...
@@ -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
;
...
...
dlls/riched20/table.c
View file @
c8fef268
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment