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

Applied patch [ 1445031 ] wxString passed as ellipsis argument in richtexthtml.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-03-07 20:40:31 +00:00
parent 4aa14001d2
commit 21e354f107
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/richtext/richtexthtml.h
View File

@@ -69,7 +69,7 @@ protected:
wxChar* b64enc( unsigned char* input, size_t in_len ); wxChar* b64enc( unsigned char* input, size_t in_len );
/// Gets the mime type of the given wxBITMAP_TYPE /// Gets the mime type of the given wxBITMAP_TYPE
wxChar* GetMimeType(int imageType); const wxChar* GetMimeType(int imageType);
/// Gets the html equivalent of the specified value /// Gets the html equivalent of the specified value
wxString GetAlignment( const wxTextAttrEx& thisStyle ); wxString GetAlignment( const wxTextAttrEx& thisStyle );

33
src/richtext/richtexthtml.cpp
View File

@@ -81,7 +81,7 @@ 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%\">");
str << wxString::Format(wxT("<font face=\"%s\" size=\"%i\" color=\"#%02X%02X%02X\" >"), str << wxString::Format(wxT("<font face=\"%s\" size=\"%i\" color=\"#%02X%02X%02X\" >"),
currentParaStyle.GetFont().GetFaceName(), Pt_To_Size( currentParaStyle.GetFont().GetPointSize() ), currentParaStyle.GetFont().GetFaceName().c_str(), Pt_To_Size( currentParaStyle.GetFont().GetPointSize() ),
currentParaStyle.GetTextColour().Red(), currentParaStyle.GetTextColour().Green(), currentParaStyle.GetTextColour().Red(), currentParaStyle.GetTextColour().Green(),
currentParaStyle.GetTextColour().Blue()); currentParaStyle.GetTextColour().Blue());
@@ -162,7 +162,7 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
//Get the appropriate tag, an ol for numerical values, an ul for dot, square etc. //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
wxString tag; wxString tag;
TypeOfList(thisStyle, tag); TypeOfList(thisStyle, tag);
str << wxString::Format(wxT("%s<li>"), tag); str << tag << wxT("<li>");
} }
} }
else else
@@ -175,7 +175,7 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
//Get the appropriate tag, an ol for numerical values, an ul for dot, square etc. //Get the appropriate tag, an ol for numerical values, an ul for dot, square etc.
wxString tag; wxString tag;
TypeOfList(thisStyle, tag); TypeOfList(thisStyle, tag);
str << wxString::Format(wxT("%s<li>"), tag); str << tag << wxT("<li>");
//Now we have a list, mark it. //Now we have a list, mark it.
m_list = true; m_list = true;
@@ -202,8 +202,7 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
{ {
if( thisStyle.GetLeftSubIndent() < 0 ) if( thisStyle.GetLeftSubIndent() < 0 )
{ {
wxString symbolic_indent = SymbolicIndent(~thisStyle.GetLeftSubIndent()); str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
str << wxString::Format(wxT("%s"), symbolic_indent);
} }
} }
else else
@@ -231,8 +230,7 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
{ {
if( thisStyle.GetLeftSubIndent() < 0 ) if( thisStyle.GetLeftSubIndent() < 0 )
{ {
wxString symbolic_indent = SymbolicIndent(~thisStyle.GetLeftSubIndent()); str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
str << wxString::Format(wxT("%s"), symbolic_indent);
} }
break; break;
} }
@@ -274,14 +272,18 @@ void wxRichTextHTMLHandler::BeginCharacterFormatting(const wxTextAttrEx& current
//Is there any change on the font properties of the item //Is there any change on the font properties of the item
if( thisStyle.GetFont().GetFaceName() != currentStyle.GetFont().GetFaceName() ) if( thisStyle.GetFont().GetFaceName() != currentStyle.GetFont().GetFaceName() )
style += wxString::Format(wxT(" face=\"%s\""), thisStyle.GetFont().GetFaceName()); style += wxString::Format(wxT(" face=\"%s\""), thisStyle.GetFont().GetFaceName().c_str());
if( thisStyle.GetFont().GetPointSize() != currentStyle.GetFont().GetPointSize() ) if( thisStyle.GetFont().GetPointSize() != currentStyle.GetFont().GetPointSize() )
style += wxString::Format(wxT(" size=\"%i\""), Pt_To_Size(thisStyle.GetFont().GetPointSize()) ); style += wxString::Format(wxT(" size=\"%i\""), Pt_To_Size(thisStyle.GetFont().GetPointSize()) );
if( thisStyle.GetTextColour() != currentStyle.GetTextColour() ) if( thisStyle.GetTextColour() != currentStyle.GetTextColour() )
style += wxString::Format(wxT(" color=\"#%02X%02X%02X\""), thisStyle.GetTextColour().Red(), style += wxString::Format(wxT(" color=\"#%02X%02X%02X\""), thisStyle.GetTextColour().Red(),
thisStyle.GetTextColour().Green(), thisStyle.GetTextColour().Blue()); thisStyle.GetTextColour().Green(), thisStyle.GetTextColour().Blue());
if( style.size() ){str << wxString::Format(wxT("<font %s >"), style); m_font = true;} if( style.size() )
{
str << wxString::Format(wxT("<font %s >"), style.c_str());
m_font = true;
}
if( thisStyle.GetFont().GetWeight() == wxBOLD ) if( thisStyle.GetFont().GetWeight() == wxBOLD )
str << wxT("<b>"); str << wxT("<b>");
@@ -317,7 +319,7 @@ void wxRichTextHTMLHandler::OutputParagraphFormatting(const wxTextAttrEx& WXUNUS
{ {
wxTextOutputStream str(stream); wxTextOutputStream str(stream);
wxString align = GetAlignment( thisStyle ); wxString align = GetAlignment( thisStyle );
str << wxString::Format(wxT("<p align=\"%s\">"), align); str << wxString::Format(wxT("<p align=\"%s\">"), align.c_str());
} }
} }
@@ -393,13 +395,12 @@ void wxRichTextHTMLHandler::Indent( const wxTextAttrEx& thisStyle, wxTextOutputS
str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>"); str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent ); wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() + thisStyle.GetLeftSubIndent()) - m_indent );
str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent ); str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent.c_str() );
str << wxT("<td width=\"100%\">"); str << wxT("<td width=\"100%\">");
if( thisStyle.GetLeftSubIndent() < 0 ) if( thisStyle.GetLeftSubIndent() < 0 )
{ {
symbolic_indent = SymbolicIndent(~thisStyle.GetLeftSubIndent()); str << SymbolicIndent(~thisStyle.GetLeftSubIndent());
str << wxString::Format(wxT("%s"), symbolic_indent);
} }
} }
@@ -432,7 +433,7 @@ void wxRichTextHTMLHandler::LIndent( const wxTextAttrEx& thisStyle, wxTextOutput
str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>"); str << wxT("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() - m_indent) - 100); wxString symbolic_indent = SymbolicIndent( (thisStyle.GetLeftIndent() - m_indent) - 100);
str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent ); str << wxString::Format( wxT("<td>%s</td>"), symbolic_indent.c_str() );
str << wxT("<td width=\"100%\">"); str << wxT("<td width=\"100%\">");
} }
@@ -513,7 +514,7 @@ wxString wxRichTextHTMLHandler::SymbolicIndent(long indent)
return in; return in;
} }
wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType) const wxChar* wxRichTextHTMLHandler::GetMimeType(int imageType)
{ {
switch(imageType) switch(imageType)
{ {
@@ -539,7 +540,7 @@ wxChar* wxRichTextHTMLHandler::b64enc( unsigned char* input, size_t in_len )
//otherwise encoder will fail //otherwise encoder will fail
//hmmm.. Does wxT macro define a char as 16 bit value //hmmm.. Does wxT macro define a char as 16 bit value
//when compiling with UNICODE option? //when compiling with UNICODE option?
const static wxChar* enc64 = wxT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"); static const wxChar enc64[] = wxT("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/");
wxChar* output = new wxChar[4*((in_len+2)/3)+1]; wxChar* output = new wxChar[4*((in_len+2)/3)+1];
wxChar* p = output; wxChar* p = output;