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

richedit: Make sure the nested tables' RTF properties are not skipped.

This commit is contained in:
Dylan Smith 2008-09-11 13:32:06 -04:00 committed by Alexandre Julliard
parent d7ff24378a
commit 0d8e9e622f
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/riched20/editor.c
View File

@ -1476,7 +1476,10 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre
RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup); RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup);
RTFSetDestinationCallback(&parser, rtfObject, ME_RTFReadObjectGroup); RTFSetDestinationCallback(&parser, rtfObject, ME_RTFReadObjectGroup);
if (!parser.editor->bEmulateVersion10) /* v4.1 */ if (!parser.editor->bEmulateVersion10) /* v4.1 */
{
RTFSetDestinationCallback(&parser, rtfNoNestTables, RTFSkipGroup); RTFSetDestinationCallback(&parser, rtfNoNestTables, RTFSkipGroup);
RTFSetDestinationCallback(&parser, rtfNestTableProps, RTFReadGroup);
}
BeginFile(&parser); BeginFile(&parser);
/* do the parsing */ /* do the parsing */

10
dlls/riched20/reader.c
View File

@ -406,6 +406,16 @@ void RTFSkipGroup(RTF_Info *info)
} }
} }
/*
* Do no special processing on the group.
*
* This acts as a placeholder for a callback in order to indicate that it
* shouldn't be ignored. Instead it will fallback on the loop in RTFRead.
*/
void RTFReadGroup (RTF_Info *info)
{
}
/* /*
* Read one token. Call the read hook if there is one. The * Read one token. Call the read hook if there is one. The

1
dlls/riched20/rtf.h
View File

@ -1211,6 +1211,7 @@ void RTFSetReadHook (RTF_Info *, RTFFuncPtr);
RTFFuncPtr RTFGetReadHook (const RTF_Info *); RTFFuncPtr RTFGetReadHook (const RTF_Info *);
void RTFRouteToken (RTF_Info *); void RTFRouteToken (RTF_Info *);
void RTFSkipGroup (RTF_Info *); void RTFSkipGroup (RTF_Info *);
void RTFReadGroup (RTF_Info *);
void RTFExpandStyle (RTF_Info *, int); void RTFExpandStyle (RTF_Info *, int);
int RTFCheckCM (const RTF_Info *, int, int); int RTFCheckCM (const RTF_Info *, int, int);
int RTFCheckCMM (const RTF_Info *, int, int, int); int RTFCheckCMM (const RTF_Info *, int, int, int);