From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 27 Apr 2010 16:07:38 +0000 (+0000)
Subject: Font output fix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7e7ced16e4c2ef7c88bdea84d78bb3c169a7bce3

Font output fix


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

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