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

riched20: Use a paragraph ptr in the rtf writer 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-11-04 06:56:22 +00:00 committed by Alexandre Julliard
parent f629166425
commit 04158801f9
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
dlls/riched20/writer.c
View File

@ -995,7 +995,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream,
const ME_Cursor *start, int nChars, int dwFormat) const ME_Cursor *start, int nChars, int dwFormat)
{ {
ME_Cursor cursor = *start; ME_Cursor cursor = *start;
ME_DisplayItem *prev_para = NULL; ME_Paragraph *prev_para = NULL;
ME_Cursor endCur = cursor; ME_Cursor endCur = cursor;
ME_MoveCursorChars(editor, &endCur, nChars, TRUE); ME_MoveCursorChars(editor, &endCur, nChars, TRUE);
@ -1019,64 +1019,82 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream,
/* TODO: section formatting properties */ /* TODO: section formatting properties */
do { do
if (cursor.pPara != prev_para)
{ {
prev_para = cursor.pPara; if (&cursor.pPara->member.para != prev_para)
{
prev_para = &cursor.pPara->member.para;
if (!stream_out_para_props( editor, pStream, &cursor.pPara->member.para )) if (!stream_out_para_props( editor, pStream, &cursor.pPara->member.para ))
return FALSE; return FALSE;
} }
if (cursor.pRun == endCur.pRun && !endCur.nOffset) if (cursor.pRun == endCur.pRun && !endCur.nOffset)
break; break;
TRACE("flags %xh\n", cursor.pRun->member.run.nFlags); TRACE("flags %xh\n", cursor.pRun->member.run.nFlags);
/* TODO: emit embedded objects */ /* TODO: emit embedded objects */
if (cursor.pPara->member.para.nFlags & (MEPF_ROWSTART | MEPF_ROWEND)) if (cursor.pPara->member.para.nFlags & (MEPF_ROWSTART | MEPF_ROWEND))
continue; continue;
if (cursor.pRun->member.run.nFlags & MERF_GRAPHICS) { if (cursor.pRun->member.run.nFlags & MERF_GRAPHICS)
{
if (!stream_out_graphics(editor, pStream, &cursor.pRun->member.run)) if (!stream_out_graphics(editor, pStream, &cursor.pRun->member.run))
return FALSE; return FALSE;
} else if (cursor.pRun->member.run.nFlags & MERF_TAB) { }
else if (cursor.pRun->member.run.nFlags & MERF_TAB)
{
if (editor->bEmulateVersion10 && /* v1.0 - 3.0 */ if (editor->bEmulateVersion10 && /* v1.0 - 3.0 */
cursor.pPara->member.para.fmt.dwMask & PFM_TABLE && para_in_table( &cursor.pPara->member.para ))
cursor.pPara->member.para.fmt.wEffects & PFE_TABLE)
{ {
if (!ME_StreamOutPrint(pStream, "\\cell ")) if (!ME_StreamOutPrint(pStream, "\\cell "))
return FALSE; return FALSE;
} else { }
else
{
if (!ME_StreamOutPrint(pStream, "\\tab ")) if (!ME_StreamOutPrint(pStream, "\\tab "))
return FALSE; return FALSE;
} }
} else if (cursor.pRun->member.run.nFlags & MERF_ENDCELL) { }
if (pStream->nNestingLevel > 1) { else if (cursor.pRun->member.run.nFlags & MERF_ENDCELL)
{
if (pStream->nNestingLevel > 1)
{
if (!ME_StreamOutPrint(pStream, "\\nestcell ")) if (!ME_StreamOutPrint(pStream, "\\nestcell "))
return FALSE; return FALSE;
} else { }
else
{
if (!ME_StreamOutPrint(pStream, "\\cell ")) if (!ME_StreamOutPrint(pStream, "\\cell "))
return FALSE; return FALSE;
} }
nChars--; nChars--;
} else if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) { }
else if (cursor.pRun->member.run.nFlags & MERF_ENDPARA)
{
if (!ME_StreamOutRTFCharProps(pStream, &cursor.pRun->member.run.style->fmt)) if (!ME_StreamOutRTFCharProps(pStream, &cursor.pRun->member.run.style->fmt))
return FALSE; return FALSE;
if (cursor.pPara->member.para.fmt.dwMask & PFM_TABLE && if (para_in_table( &cursor.pPara->member.para) &&
cursor.pPara->member.para.fmt.wEffects & PFE_TABLE &&
!(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART | MEPF_ROWEND | MEPF_CELL))) !(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART | MEPF_ROWEND | MEPF_CELL)))
{ {
if (!ME_StreamOutPrint(pStream, "\\row\r\n")) if (!ME_StreamOutPrint(pStream, "\\row\r\n"))
return FALSE; return FALSE;
} else { }
else
{
if (!ME_StreamOutPrint(pStream, "\\par\r\n")) if (!ME_StreamOutPrint(pStream, "\\par\r\n"))
return FALSE; return FALSE;
} }
/* Skip as many characters as required by current line break */ /* Skip as many characters as required by current line break */
nChars = max(0, nChars - cursor.pRun->member.run.len); nChars = max(0, nChars - cursor.pRun->member.run.len);
} else if (cursor.pRun->member.run.nFlags & MERF_ENDROW) { }
else if (cursor.pRun->member.run.nFlags & MERF_ENDROW)
{
if (!ME_StreamOutPrint(pStream, "\\line\r\n")) if (!ME_StreamOutPrint(pStream, "\\line\r\n"))
return FALSE; return FALSE;
nChars--; nChars--;
} else { }
else
{
int nEnd; int nEnd;
TRACE("style %p\n", cursor.pRun->member.run.style); TRACE("style %p\n", cursor.pRun->member.run.style);