Commit 57446cee authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

riched20: Reset the numbering style info after a \pard .

parent ab65c269
...@@ -553,8 +553,9 @@ void ME_RTFParAttrHook(RTF_Info *info) ...@@ -553,8 +553,9 @@ void ME_RTFParAttrHook(RTF_Info *info)
info->borderType = RTFBorderParaTop; info->borderType = RTFBorderParaTop;
info->fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | info->fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS |
PFM_OFFSET | PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | PFM_OFFSET | PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE |
PFM_STARTINDENT | PFM_RTLPARA; PFM_STARTINDENT | PFM_RTLPARA | PFM_NUMBERING | PFM_NUMBERINGSTART |
/* TODO: numbering, shading */ PFM_NUMBERINGSTYLE | PFM_NUMBERINGTAB;
/* TODO: shading */
info->fmt.wAlignment = PFA_LEFT; info->fmt.wAlignment = PFA_LEFT;
info->fmt.cTabCount = 0; info->fmt.cTabCount = 0;
info->fmt.dxOffset = info->fmt.dxStartIndent = info->fmt.dxRightIndent = 0; info->fmt.dxOffset = info->fmt.dxStartIndent = info->fmt.dxRightIndent = 0;
...@@ -564,6 +565,11 @@ void ME_RTFParAttrHook(RTF_Info *info) ...@@ -564,6 +565,11 @@ void ME_RTFParAttrHook(RTF_Info *info)
info->fmt.dySpaceBefore = info->fmt.dySpaceAfter = 0; info->fmt.dySpaceBefore = info->fmt.dySpaceAfter = 0;
info->fmt.dyLineSpacing = 0; info->fmt.dyLineSpacing = 0;
info->fmt.wEffects &= ~PFE_RTLPARA; info->fmt.wEffects &= ~PFE_RTLPARA;
info->fmt.wNumbering = 0;
info->fmt.wNumberingStart = 0;
info->fmt.wNumberingStyle = 0;
info->fmt.wNumberingTab = 0;
if (!info->editor->bEmulateVersion10) /* v4.1 */ if (!info->editor->bEmulateVersion10) /* v4.1 */
{ {
if (info->tableDef && info->tableDef->tableRowStart && if (info->tableDef && info->tableDef->tableRowStart &&
......
...@@ -1307,6 +1307,12 @@ static void test_SETPARAFORMAT(void) ...@@ -1307,6 +1307,12 @@ static void test_SETPARAFORMAT(void)
ok(ret == expectedMask, "expected %x got %x\n", expectedMask, ret); ok(ret == expectedMask, "expected %x got %x\n", expectedMask, ret);
ok(fmt.dwMask == expectedMask, "expected %x got %x\n", expectedMask, fmt.dwMask); ok(fmt.dwMask == expectedMask, "expected %x got %x\n", expectedMask, fmt.dwMask);
/* Test some other paraformat field defaults */
ok( fmt.wNumbering == 0, "got %d\n", fmt.wNumbering );
ok( fmt.wNumberingStart == 0, "got %d\n", fmt.wNumberingStart );
ok( fmt.wNumberingStyle == 0, "got %04x\n", fmt.wNumberingStyle );
ok( fmt.wNumberingTab == 0, "got %d\n", fmt.wNumberingTab );
DestroyWindow(hwndRichEdit); DestroyWindow(hwndRichEdit);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment