riched20: We don't need to special case the PARAFORMAT2 fields since the masks…

riched20: We don't need to special case the PARAFORMAT2 fields since the masks have already been correctly sanitised. This fixes setting PFE_RTLPARA.

riched20: We don't need to special case the PARAFORMAT2 fields since the masks…
503c6cab · Huw Davies · Alexandre Julliard · 3158fd76 · 503c6cab
Commit 503c6cab authored Mar 25, 2013 by Huw Davies Committed by Alexandre Julliard Mar 25, 2013
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

para.c dlls/riched20/para.c +2 -6

No files found.
--- a/dlls/riched20/para.c
+++ b/dlls/riched20/para.c
@@ -154,15 +154,12 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const 
    memcpy(para->member.para.pFmt->rgxTabs, pFmt->rgxTabs, pFmt->cTabCount*sizeof(LONG));
  }

-  if (dwMask & (PFM_ALL2 & ~PFM_ALL))
-  {
-    /* PARAFORMAT2 fields */
-
 #define EFFECTS_MASK (PFM_RTLPARA|PFM_KEEP|PFM_KEEPNEXT|PFM_PAGEBREAKBEFORE| \
                      PFM_NOLINENUMBER|PFM_NOWIDOWCONTROL|PFM_DONOTHYPHEN|PFM_SIDEBYSIDE| \
                      PFM_TABLE)
  /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */
-    if (dwMask & EFFECTS_MASK) {
+  if (dwMask & EFFECTS_MASK)
+  {
    para->member.para.pFmt->dwMask |= dwMask & EFFECTS_MASK;
    para->member.para.pFmt->wEffects &= ~HIWORD(dwMask);
    para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(dwMask);
@@ -182,7 +179,6 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const 
  COPY_FIELD(PFM_BORDER, wBorderSpace);
  COPY_FIELD(PFM_BORDER, wBorderWidth);
  COPY_FIELD(PFM_BORDER, wBorders);
-  }

  para->member.para.pFmt->dwMask |= dwMask;
 #undef COPY_FIELD