Huw Davies : riched20: Don't emit default values.

Alexandre Julliard julliard at winehq.org
Tue Oct 11 15:21:10 CDT 2016


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Tue Oct 11 13:04:01 2016 +0100

riched20: Don't emit default values.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/riched20/writer.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c
index 27e07b1..a2ec8f8 100644
--- a/dlls/riched20/writer.c
+++ b/dlls/riched20/writer.c
@@ -549,11 +549,11 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream,
   if (!(editor->bEmulateVersion10 && /* v1.0 - 3.0 */
         fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE))
   {
-    if (fmt->dwMask & PFM_OFFSET)
+    if (fmt->dxOffset)
       sprintf(props + strlen(props), "\\li%d", fmt->dxOffset);
-    if (fmt->dwMask & PFM_OFFSETINDENT || fmt->dwMask & PFM_STARTINDENT)
+    if (fmt->dxStartIndent)
       sprintf(props + strlen(props), "\\fi%d", fmt->dxStartIndent);
-    if (fmt->dwMask & PFM_RIGHTINDENT)
+    if (fmt->dxRightIndent)
       sprintf(props + strlen(props), "\\ri%d", fmt->dxRightIndent);
     if (fmt->dwMask & PFM_TABSTOPS) {
       static const char * const leader[6] = { "", "\\tldot", "\\tlhyph", "\\tlul", "\\tlth", "\\tleq" };
@@ -579,11 +579,11 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream,
       }
     }
   }
-  if (fmt->dwMask & PFM_SPACEAFTER)
+  if (fmt->dySpaceAfter)
     sprintf(props + strlen(props), "\\sa%d", fmt->dySpaceAfter);
-  if (fmt->dwMask & PFM_SPACEBEFORE)
+  if (fmt->dySpaceBefore)
     sprintf(props + strlen(props), "\\sb%d", fmt->dySpaceBefore);
-  if (fmt->dwMask & PFM_STYLE)
+  if (fmt->sStyle != -1)
     sprintf(props + strlen(props), "\\s%d", fmt->sStyle);
   
   if (fmt->dwMask & PFM_SHADING) {




More information about the wine-cvs mailing list