Eric Pouech : richedit: Fix reading paragraph left & first indentation attributes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cb4a41b8061a5303ea54439217aeeb3ded8bbbab
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cb4a41b8061a5303ea54439217...

Author: Eric Pouech 
Date:   Sun Mar 16 21:46:03 2008 +0100

richedit: Fix reading paragraph left & first indentation attributes.

---

dlls/riched20/editor.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index ce8473d..99e2059 100644
--- 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;