From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 11 Aug 2009 09:28:02 +0000 (+0000)
Subject: If zero spacing after paragraph is explicitly specified, suppress spacing after parag... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2b2c1044f9df296935aadd23e2a58f79b018905f

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


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 301065a91e..0768034376 100644
--- 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);
-            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();
@@ -276,7 +281,12 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
         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(">");
     }
 }