Added a couple of text effects
Added style description Fixed some bugs in style comparison Fixed extra newline when loading git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -100,8 +100,13 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
|
||||
{
|
||||
wxTextAttrEx charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
|
||||
BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, stream);
|
||||
|
||||
wxString text = textObj->GetText();
|
||||
|
||||
str << textObj->GetText();
|
||||
if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
|
||||
text.MakeUpper();
|
||||
|
||||
str << text;
|
||||
|
||||
EndCharacterFormatting(currentCharStyle, charStyle, paraStyle, stream);
|
||||
}
|
||||
@@ -321,6 +326,12 @@ void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUS
|
||||
wxString align = GetAlignment(thisStyle);
|
||||
str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
|
||||
}
|
||||
|
||||
if (thisStyle.HasPageBreak())
|
||||
{
|
||||
wxTextOutputStream str(stream);
|
||||
str << wxT("<div style=\"page-break-after:always\"></div>\n");
|
||||
}
|
||||
}
|
||||
|
||||
void wxRichTextHTMLHandler::NavigateToListPosition(const wxTextAttrEx& thisStyle, wxTextOutputStream& str)
|
||||
|
||||
Reference in New Issue
Block a user