richedit: Removed assumption about the order of rtf indent control words.

Previously the calculations of dxStartIdent and dxOffset depended on their order.

richedit: Removed assumption about the order of rtf indent control words.
e568e151 · Dylan Smith · Alexandre Julliard · 2cd62080 · e568e151
Commit e568e151 authored Aug 07, 2008 by Dylan Smith Committed by Alexandre Julliard Aug 18, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

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

No files found.
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -473,15 +473,13 @@ 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.dxStartIndent += fmt.dxOffset + 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 = info->rtfParam;
-    fmt.dxOffset = 0;
+    fmt.dxStartIndent = info->rtfParam - fmt.dxOffset;
    break;
  case rtfRightIndent:
    fmt.dwMask = PFM_RIGHTINDENT;