Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Font output fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2010-04-27 16:07:38 +00:00
parent ee7bcb842c
commit 7e7ced16e4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/richtext/richtexthtml.cpp
View File

@@ -331,8 +331,6 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
m_inTable = true; m_inTable = true;
} }
OutputFont(thisStyle, str);
if (((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) && (thisStyle.GetLeftSubIndent() < 0)) if (((GetFlags() & wxRICHTEXT_HANDLER_USE_CSS) == 0) && (thisStyle.GetLeftSubIndent() < 0))
{ {
str << SymbolicIndent( - thisStyle.GetLeftSubIndent()); str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
@@ -366,16 +364,17 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(
str << wxT(">"); str << wxT(">");
} }
OutputFont(thisStyle, str);
} }
/// End paragraph formatting /// End paragraph formatting
void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& stream) void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& stream)
{ {
if (thisStyle.HasFont())
stream << wxT("</font>");
if (m_inTable) if (m_inTable)
{ {
if (thisStyle.HasFont())
stream << wxT("</font>");
stream << wxT("</td></tr></table></p>\n"); stream << wxT("</td></tr></table></p>\n");
m_inTable = false; m_inTable = false;
} }