richedit: Fix reading paragraph left & first indentation attributes.

cb4a41b8 · Eric Pouech · Alexandre Julliard · f628a1c2 · cb4a41b8
Commit cb4a41b8 authored Mar 16, 2008 by Eric Pouech Committed by Alexandre Julliard Mar 17, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

editor.c dlls/riched20/editor.c +6 -4

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -471,14 +471,16 @@ static void ME_RTFParAttrHook(RTF_Info *info)
  }
  case rtfFirstIndent:
    ME_GetSelectionParaFormat(info->editor, &fmt);
-    fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET;
-    fmt.dxStartIndent += info->rtfParam + fmt.dxOffset;
+    fmt.dwMask |= PFM_STARTINDENT | PFM_OFFSET;
+    fmt.dxStartIndent += info->rtfParam;
    fmt.dxOffset = -info->rtfParam;
    break;
  case rtfLeftIndent:
+    /* we assume rtfLeftIndent is always specified before rtfFirstIndent */
    ME_GetSelectionParaFormat(info->editor, &fmt);
-    fmt.dwMask = PFM_STARTINDENT;
-    fmt.dxStartIndent = -fmt.dxOffset + info->rtfParam;
+    fmt.dwMask |= PFM_STARTINDENT;
+    fmt.dxStartIndent = info->rtfParam;
+    fmt.dxOffset = 0;
    break;
  case rtfRightIndent:
    fmt.dwMask = PFM_RIGHTINDENT;