X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/945c909da9a8ee487da102b8806b6fd76b5f6849..6ce832135e0cd665403406e7276630f415a7875b:/src/richtext/richtexthtml.cpp diff --git a/src/richtext/richtexthtml.cpp b/src/richtext/richtexthtml.cpp index 6af5ab0ae5..06670cb486 100644 --- a/src/richtext/richtexthtml.cpp +++ b/src/richtext/richtexthtml.cpp @@ -85,8 +85,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& customEncoding = new wxCSConv(GetEncoding()); if (!customEncoding->IsOk()) { - delete customEncoding; - customEncoding = NULL; + wxDELETE(customEncoding); } } if (customEncoding) @@ -102,8 +101,8 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& wxTextOutputStream str(stream, wxEOL_NATIVE); #endif - wxTextAttr currentParaStyle = buffer->GetAttributes(); - wxTextAttr currentCharStyle = buffer->GetAttributes(); + wxRichTextAttr currentParaStyle = buffer->GetAttributes(); + wxRichTextAttr currentCharStyle = buffer->GetAttributes(); if ((GetFlags() & wxRICHTEXT_HANDLER_NO_HEADER_FOOTER) == 0) str << wxT("\n"); @@ -124,7 +123,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& if (para) { - wxTextAttr paraStyle(para->GetCombinedAttributes()); + wxRichTextAttr paraStyle(para->GetCombinedAttributes()); BeginParagraphFormatting(currentParaStyle, paraStyle, str); @@ -135,7 +134,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& wxRichTextPlainText* textObj = wxDynamicCast(obj, wxRichTextPlainText); if (textObj && !textObj->IsEmpty()) { - wxTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes())); + wxRichTextAttr charStyle(para->GetCombinedAttributes(obj->GetAttributes())); BeginCharacterFormatting(currentCharStyle, charStyle, paraStyle, str); wxString text = textObj->GetText(); @@ -185,7 +184,7 @@ bool wxRichTextHTMLHandler::DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& return true; } -void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentStyle, const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str) +void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& str) { wxString style; @@ -197,10 +196,27 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentSt } if (thisStyle.GetFontSize() != currentStyle.GetFontSize()) style += wxString::Format(wxT(" size=\"%ld\""), PtToSize(thisStyle.GetFontSize())); - if (thisStyle.GetTextColour() != currentStyle.GetTextColour() ) + + bool bTextColourChanged = (thisStyle.GetTextColour() != currentStyle.GetTextColour()); + bool bBackgroundColourChanged = (thisStyle.GetBackgroundColour() != currentStyle.GetBackgroundColour()); + if (bTextColourChanged || bBackgroundColourChanged) { - wxString color(thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX)); - style += wxString::Format(wxT(" color=\"%s\""), color.c_str()); + style += wxT(" style=\""); + + if (bTextColourChanged) + { + wxString color(thisStyle.GetTextColour().GetAsString(wxC2S_HTML_SYNTAX)); + style += wxString::Format(wxT("color: %s"), color.c_str()); + } + if (bTextColourChanged && bBackgroundColourChanged) + style += wxT(";"); + if (bBackgroundColourChanged) + { + wxString color(thisStyle.GetBackgroundColour().GetAsString(wxC2S_HTML_SYNTAX)); + style += wxString::Format(wxT("background-color: %s"), color.c_str()); + } + + style += wxT("\""); } if (style.size()) @@ -220,7 +236,7 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttr& currentSt str << wxT(""); } -void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, const wxTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream) +void wxRichTextHTMLHandler::EndCharacterFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, const wxRichTextAttr& WXUNUSED(paraStyle), wxTextOutputStream& stream) { if (thisStyle.HasURL()) stream << wxT(""); @@ -240,7 +256,7 @@ void wxRichTextHTMLHandler::EndCharacterFormatting(const wxTextAttr& WXUNUSED(cu } /// Begin paragraph formatting -void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxTextAttr& WXUNUSED(currentStyle), const wxTextAttr& thisStyle, wxTextOutputStream& str) +void wxRichTextHTMLHandler::BeginParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& str) { if (thisStyle.HasPageBreak()) { @@ -331,8 +347,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 +380,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) +void wxRichTextHTMLHandler::EndParagraphFormatting(const wxRichTextAttr& WXUNUSED(currentStyle), const wxRichTextAttr& thisStyle, wxTextOutputStream& stream) { + if (thisStyle.HasFont()) + stream << wxT(""); + if (m_inTable) { - if (thisStyle.HasFont()) - stream << wxT(""); - stream << wxT("

\n"); m_inTable = false; } @@ -407,7 +422,7 @@ void wxRichTextHTMLHandler::CloseLists(int level, wxTextOutputStream& str) } /// Output font tag -void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStream& stream) +void wxRichTextHTMLHandler::OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream) { if (style.HasFont()) { @@ -418,7 +433,7 @@ void wxRichTextHTMLHandler::OutputFont(const wxTextAttr& style, wxTextOutputStre } } -int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& thisStyle, wxString& tag ) +int wxRichTextHTMLHandler::TypeOfList( const wxRichTextAttr& thisStyle, wxString& tag ) { // We can use number attribute of li tag but not all the browsers support it. // also wxHtmlWindow doesn't support type attribute. @@ -446,7 +461,7 @@ int wxRichTextHTMLHandler::TypeOfList( const wxTextAttr& thisStyle, wxString& ta return 0; } -wxString wxRichTextHTMLHandler::GetAlignment( const wxTextAttr& thisStyle ) +wxString wxRichTextHTMLHandler::GetAlignment( const wxRichTextAttr& thisStyle ) { switch( thisStyle.GetAlignment() ) { @@ -472,20 +487,27 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s #if wxUSE_FILESYSTEM if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY) { - if (!image->GetImage().Ok() && image->GetImageBlock().GetData()) +#if 0 + if (!image->GetImage().IsOk() && image->GetImageBlock().GetData()) image->LoadFromBlock(); - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) image->MakeBlock(); +#endif - if (image->GetImage().Ok()) + if (image->GetImageBlock().IsOk()) { - wxString ext(image->GetImageBlock().GetExtension()); - wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext)); - wxMemoryFSHandler::AddFile(tempFilename, image->GetImage(), image->GetImageBlock().GetImageType()); + wxImage img; + image->GetImageBlock().Load(img); + if (img.IsOk()) + { + wxString ext(image->GetImageBlock().GetExtension()); + wxString tempFilename(wxString::Format(wxT("image%d.%s"), sm_fileCounter, ext)); + wxMemoryFSHandler::AddFile(tempFilename, img, image->GetImageBlock().GetImageType()); - m_imageLocations.Add(tempFilename); + m_imageLocations.Add(tempFilename); - str << wxT("memory:") << tempFilename; + str << wxT("memory:") << tempFilename; + } } else str << wxT("memory:?"); @@ -494,12 +516,14 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s } else if (GetFlags() & wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES) { - if (!image->GetImage().Ok() && image->GetImageBlock().GetData()) +#if 0 + if (!image->GetImage().IsOk() && image->GetImageBlock().GetData()) image->LoadFromBlock(); - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) image->MakeBlock(); +#endif - if (image->GetImage().Ok()) + if (image->GetImageBlock().IsOk()) { wxString tempDir(GetTempDir()); if (tempDir.IsEmpty()) @@ -524,14 +548,17 @@ void wxRichTextHTMLHandler::WriteImage(wxRichTextImage* image, wxOutputStream& s str << wxT("data:"); str << GetMimeType(image->GetImageBlock().GetImageType()); str << wxT(";base64,"); - - if (image->GetImage().Ok() && !image->GetImageBlock().GetData()) +#if 0 + if (image->GetImage().IsOk() && !image->GetImageBlock().GetData()) image->MakeBlock(); +#endif + if (image->GetImageBlock().IsOk()) + { + wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() ); + str << data; - wxChar* data = b64enc( image->GetImageBlock().GetData(), image->GetImageBlock().GetDataSize() ); - str << data; - - delete[] data; + delete[] data; + } } str << wxT("\" />");