If zero spacing after paragraph is explicitly specified, suppress spacing after parag...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp
index 301065a91ec9244be0584cf809dff0b88572770a..07680343763b8145281548c34b060e0fe474999e 100644 (file)
--- a/src/richtext/richtexthtml.cpp
+++ b/src/richtext/richtexthtml.cpp
@@ -253,7 +253,12 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
             CloseLists(-1, str);
 
             wxString align = GetAlignment(thisStyle);
             CloseLists(-1, str);
 
             wxString align = GetAlignment(thisStyle);

-            str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
+            str << wxString::Format(wxT("<p align=\"%s\""), align.c_str());
+
+            if (thisStyle.HasParagraphSpacingAfter() && thisStyle.GetParagraphSpacingAfter() == 0)
+               str << wxT(" style=\"line-height: 0px\"");
+
+            str << wxT(">");

 
             // Use a table
             int indentTenthsMM = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
 
             // Use a table
             int indentTenthsMM = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();


@@ -276,7 +281,12 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
         CloseLists(-1, str);
 
         wxString align = GetAlignment(thisStyle);
         CloseLists(-1, str);
 
         wxString align = GetAlignment(thisStyle);

-        str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
+        str << wxString::Format(wxT("<p align=\"%s\""), align.c_str());
+
+        if (thisStyle.HasParagraphSpacingAfter() && thisStyle.GetParagraphSpacingAfter() == 0)
+            str << wxT(" style=\"line-height: 0px\"");
+
+        str << wxT(">");

     }
 }
 
     }
 }