AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only write text colour if the colour is valid

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2007-09-07 14:16:07 +00:00
parent 1d9fe50dc9
commit b72812a640
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/richtext/richtexthtml.cpp
View File

@ -76,7 +76,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
ClearTemporaryImageLocations(); ClearTemporaryImageLocations();
buffer->Defragment(); buffer->Defragment();
wxTextOutputStream str(stream); wxTextOutputStream str(stream);
wxTextAttrEx currentParaStyle = buffer->GetAttributes(); wxTextAttrEx currentParaStyle = buffer->GetAttributes();
@ -88,10 +88,10 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">"); str << wxT("<table border=0 cellpadding=0 cellspacing=0><tr><td width=\"100%\">");
OutputFont(currentParaStyle, str); OutputFont(currentParaStyle, str);
m_font = false; m_font = false;
m_inTable = false; m_inTable = false;
m_indents.Clear(); m_indents.Clear();
m_listTypes.Clear(); m_listTypes.Clear();
@ -104,7 +104,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
if (para) if (para)
{ {
wxTextAttrEx paraStyle(para->GetCombinedAttributes()); wxTextAttrEx paraStyle(para->GetCombinedAttributes());
BeginParagraphFormatting(currentParaStyle, paraStyle, str); BeginParagraphFormatting(currentParaStyle, paraStyle, str);
wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst(); wxRichTextObjectList::compatibility_iterator node2 = para->GetChildren().GetFirst();
@ -116,7 +116,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
{ {
wxTextAttrEx charStyle(para->GetCombinedAttributes(obj->GetAttributes())); wxTextAttrEx charStyle(para->GetCombinedAttributes(obj->GetAttributes()));
BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str); BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str);
wxString text = textObj->GetText(); wxString text = textObj->GetText();
if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS)) if (charStyle.HasTextEffects() && (charStyle.GetTextEffects() & wxTEXT_ATTR_EFFECT_CAPITALS))
@ -143,16 +143,16 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream&
} }
node = node->GetNext(); node = node->GetNext();
} }
CloseLists(-1, str); CloseLists(-1, str);
str << wxT("</font>"); str << wxT("</font>");
str << wxT("</td></tr></table><p>"); str << wxT("</td></tr></table><p>");
if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0)
str << wxT("</body></html>"); str << wxT("</body></html>");
str << wxT("\n"); str << wxT("\n");
m_buffer = NULL; m_buffer = NULL;
@ -190,7 +190,7 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
str << wxT("<i>"); str << wxT("<i>");
if (thisStyle.GetFont().GetUnderlined()) if (thisStyle.GetFont().GetUnderlined())
str << wxT("<u>"); str << wxT("<u>");
if (thisStyle.HasURL()) if (thisStyle.HasURL())
str << wxT("<a href=\"") << thisStyle.GetURL() << wxT("\">"); str << wxT("<a href=\"") << thisStyle.GetURL() << wxT("\">");
} }
@ -232,7 +232,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE
// Close levels high than this // Close levels high than this
CloseLists(indent, str); CloseLists(indent, str);
if (m_indents.GetCount() > 0 && indent == m_indents.Last()) if (m_indents.GetCount() > 0 && indent == m_indents.Last())
{ {
// Same level, no need to start a new list // Same level, no need to start a new list
@ -240,23 +240,23 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE
else if (m_indents.GetCount() == 0 || indent > m_indents.Last()) else if (m_indents.GetCount() == 0 || indent > m_indents.Last())
{ {
m_indents.Add(indent); m_indents.Add(indent);
wxString tag; wxString tag;
int listType = TypeOfList(thisStyle, tag); int listType = TypeOfList(thisStyle, tag);
m_listTypes.Add(listType); m_listTypes.Add(listType);
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());
str << tag; str << tag;
} }
str << wxT("<li> "); str << wxT("<li> ");
} }
else else
{ {
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());
@ -273,7 +273,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE
str << SymbolicIndent( - thisStyle.GetLeftSubIndent()); str << SymbolicIndent( - thisStyle.GetLeftSubIndent());
} }
m_inTable = true; m_inTable = true;
} }
} }
else else
@ -282,7 +282,7 @@ void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttrEx& WXUNUSE
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());
} }
} }
/// End paragraph formatting /// End paragraph formatting
@ -292,7 +292,7 @@ void wxRichTextHTMLHandler::EndParagraphFormatting(const wxTextAttrEx& WXUNUSED(
{ {
if (thisStyle.HasFont()) if (thisStyle.HasFont())
stream << wxT("</font>"); stream << wxT("</font>");
stream << wxT("</td></tr></table>\n"); stream << wxT("</td></tr></table>\n");
m_inTable = false; m_inTable = false;
} }
@ -326,9 +326,10 @@ void wxRichTextHTMLHandler::OutputFont(const wxTextAttrEx& style, wxTextOutputSt
{ {
if (style.HasFont()) if (style.HasFont())
{ {
stream << wxString::Format(wxT("<font face=\"%s\" size=\"%ld\" color=\"%s\" >"), stream << wxString::Format(wxT("<font face=\"%s\" size=\"%ld\""), style.GetFont().GetFaceName().c_str(), PtToSize(style.GetFont().GetPointSize()));
style.GetFont().GetFaceName().c_str(), PtToSize(style.GetFont().GetPointSize()), if (style.HasTextColour())
style.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str()); stream << wxString::Format(wxT(" color=\"%s\""), style.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX).c_str());
stream << wxT(" >");
} }
} }
@ -353,7 +354,7 @@ int wxRichTextHTMLHandler::TypeOfList( const wxTextAttrEx& thisStyle, wxString&
tag = wxT("<ul>"); tag = wxT("<ul>");
m_is_ul = true; m_is_ul = true;
} }
if (m_is_ul) if (m_is_ul)
return 1; return 1;
else else
@ -392,13 +393,13 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
image->MakeBlock(); image->MakeBlock();
if (image->GetImage().Ok()) if (image->GetImage().Ok())
{ {
wxString ext(image->GetImageBlock().GetExtension()); wxString ext(image->GetImageBlock().GetExtension());
wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext)); wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext));
wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType()); wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType());
m_imageLocations.Add(tempFilename); m_imageLocations.Add(tempFilename);
str << wxT("memory:") << tempFilename; str << wxT("memory:") << tempFilename;
} }
else else
@ -414,18 +415,18 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s
image->MakeBlock(); image->MakeBlock();
if (image->GetImage().Ok()) if (image->GetImage().Ok())
{ {
wxString tempDir(GetTempDir()); wxString tempDir(GetTempDir());
if (tempDir.IsEmpty()) if (tempDir.IsEmpty())
tempDir = wxFileName::GetTempDir(); tempDir = wxFileName::GetTempDir();
wxString ext(image->GetImageBlock().GetExtension()); wxString ext(image->GetImageBlock().GetExtension());
wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir, sm_fileCounter, ext)); wxString tempFilename(wxString::Format(wxT("%s/image%d.%s"), tempDir, sm_fileCounter, ext));
image->GetImageBlock().Write(tempFilename); image->GetImageBlock().Write(tempFilename);
m_imageLocations.Add(tempFilename); m_imageLocations.Add(tempFilename);
str << wxFileSystem::FileNameToURL(tempFilename); str << wxFileSystem::FileNameToURL(tempFilename);
} }
else else
str << wxT("file:?"); str << wxT("file:?");
@ -458,7 +459,7 @@ long wxRichTextHTMLHandler::PtToSize(long size)
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
if (size <= m_fontSizeMapping[i]) if (size <= m_fontSizeMapping[i])
return i+1; return i+1;
return 7; return 7;
} }
wxString wxRichTextHTMLHandler::SymbolicIndent(long indent) wxString wxRichTextHTMLHandler::SymbolicIndent(long indent)
@ -552,7 +553,7 @@ bool wxRichTextHTMLHandler::DeleteTemporaryImages(int flags, const wxArrayString
for (i = 0; i < imageLocations.GetCount(); i++) for (i = 0; i < imageLocations.GetCount(); i++)
{ {
wxString location = imageLocations[i]; wxString location = imageLocations[i];
if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY) if (flags & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY)
{ {
#if wxUSE_FILESYSTEM #if wxUSE_FILESYSTEM
@ -565,7 +566,7 @@ bool wxRichTextHTMLHandler::DeleteTemporaryImages(int flags, const wxArrayString
wxRemoveFile(location); wxRemoveFile(location);
} }
} }
return true; return true;
} }