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
This commit is contained in:
parent
bb9e19db3d
commit
2b2c1044f9
@ -253,7 +253,12 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
|
|||||||
CloseLists(-1, str);
|
CloseLists(-1, str);
|
||||||
|
|
||||||
wxString align = GetAlignment(thisStyle);
|
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
|
// Use a table
|
||||||
int indentTenthsMM = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
|
int indentTenthsMM = thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent();
|
||||||
@ -276,7 +281,12 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
|
|||||||
CloseLists(-1, str);
|
CloseLists(-1, str);
|
||||||
|
|
||||||
wxString align = GetAlignment(thisStyle);
|
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(">");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user