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

riched20: Add a helper to find a colour in the colour table. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2016-10-12 12:58:51 +01:00 committed by Alexandre Julliard
parent 48c0c6648b
commit 3e9a31ed26
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dlls/riched20/writer.c
View File

@ -277,6 +277,23 @@ static void add_color_to_colortbl( ME_OutStream *stream, COLORREF color )
} }
} }
static BOOL find_color_in_colortbl( ME_OutStream *stream, COLORREF color, unsigned int *idx )
{
int i;
*idx = 0;
for (i = 1; i < stream->nColorTblLen; i++)
{
if (stream->colortbl[i] == color)
{
*idx = i;
break;
}
}
return i < stream->nFontTblLen;
}
static BOOL static BOOL
ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun,
ME_DisplayItem *pLastRun) ME_DisplayItem *pLastRun)
@ -391,17 +408,13 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream,
{ {
if (borders[i]->width) if (borders[i]->width)
{ {
unsigned int j; unsigned int idx;
COLORREF crColor = borders[i]->colorRef; COLORREF crColor = borders[i]->colorRef;
sprintf(props + strlen(props), "\\clbrdr%c", sideChar[i]); sprintf(props + strlen(props), "\\clbrdr%c", sideChar[i]);
sprintf(props + strlen(props), "\\brdrs"); sprintf(props + strlen(props), "\\brdrs");
sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width);
for (j = 1; j < pStream->nColorTblLen; j++) { if (find_color_in_colortbl( pStream, crColor, &idx ))
if (pStream->colortbl[j] == crColor) { sprintf(props + strlen(props), "\\brdrcf%u", idx);
sprintf(props + strlen(props), "\\brdrcf%u", j);
break;
}
}
} }
} }
sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary);
@ -423,17 +436,13 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream,
{ {
if (borders[i]->width) if (borders[i]->width)
{ {
unsigned int j; unsigned int idx;
COLORREF crColor = borders[i]->colorRef; COLORREF crColor = borders[i]->colorRef;
sprintf(props + strlen(props), "\\trbrdr%c", sideChar[i]); sprintf(props + strlen(props), "\\trbrdr%c", sideChar[i]);
sprintf(props + strlen(props), "\\brdrs"); sprintf(props + strlen(props), "\\brdrs");
sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width);
for (j = 1; j < pStream->nColorTblLen; j++) { if (find_color_in_colortbl( pStream, crColor, &idx ))
if (pStream->colortbl[j] == crColor) { sprintf(props + strlen(props), "\\brdrcf%u", idx);
sprintf(props + strlen(props), "\\brdrcf%u", j);
break;
}
}
} }
} }
for (i = 0; i < pFmt->cTabCount; i++) for (i = 0; i < pFmt->cTabCount; i++)
@ -642,26 +651,15 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt)
strcat(props, "\\caps"); strcat(props, "\\caps");
if (fmt->dwMask & CFM_ANIMATION) if (fmt->dwMask & CFM_ANIMATION)
sprintf(props + strlen(props), "\\animtext%u", fmt->bAnimation); sprintf(props + strlen(props), "\\animtext%u", fmt->bAnimation);
if (fmt->dwMask & CFM_BACKCOLOR) { if ((fmt->dwMask & CFM_BACKCOLOR) && !(fmt->dwEffects & CFE_AUTOBACKCOLOR))
if (!(fmt->dwEffects & CFE_AUTOBACKCOLOR)) { if (find_color_in_colortbl( pStream, fmt->crBackColor, &i ))
for (i = 1; i < pStream->nColorTblLen; i++) sprintf(props + strlen(props), "\\cb%u", i);
if (pStream->colortbl[i] == fmt->crBackColor) {
sprintf(props + strlen(props), "\\cb%u", i);
break;
}
}
}
if (fmt->dwMask & CFM_BOLD && fmt->dwEffects & CFE_BOLD) if (fmt->dwMask & CFM_BOLD && fmt->dwEffects & CFE_BOLD)
strcat(props, "\\b"); strcat(props, "\\b");
if (fmt->dwMask & CFM_COLOR) { if ((fmt->dwMask & CFM_COLOR) && !(fmt->dwEffects & CFE_AUTOCOLOR))
if (!(fmt->dwEffects & CFE_AUTOCOLOR)) { if (find_color_in_colortbl( pStream, fmt->crTextColor, &i ))
for (i = 1; i < pStream->nColorTblLen; i++) sprintf(props + strlen(props), "\\cf%u", i);
if (pStream->colortbl[i] == fmt->crTextColor) {
sprintf(props + strlen(props), "\\cf%u", i);
break;
}
}
}
/* TODO: CFM_DISABLED */ /* TODO: CFM_DISABLED */
if (fmt->dwMask & CFM_EMBOSS && fmt->dwEffects & CFE_EMBOSS) if (fmt->dwMask & CFM_EMBOSS && fmt->dwEffects & CFE_EMBOSS)
strcat(props, "\\embo"); strcat(props, "\\embo");