neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed an encoding problem

This commit is contained in:
Zane U. Ji 2012-08-09 21:31:10 +08:00
parent 97b3ac3fc1
commit 5ad9659c19
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xmlcopyeditor.cpp
View File

@ -5834,6 +5834,8 @@ void MyFrame::OnAssociate ( wxCommandEvent& event )
std::string utf8Buffer; std::string utf8Buffer;
getRawText ( doc, utf8Buffer ); getRawText ( doc, utf8Buffer );
std::string origEncoding = XmlEncodingHandler::get ( utf8Buffer );
XmlEncodingHandler::setUtf8 ( utf8Buffer, true );
std::auto_ptr<WrapExpat> wellformedparser ( new WrapExpat() ); std::auto_ptr<WrapExpat> wellformedparser ( new WrapExpat() );
if ( !wellformedparser->parse ( utf8Buffer ) ) // FIXME: Set encoding to UTF-8 before parsing. if ( !wellformedparser->parse ( utf8Buffer ) ) // FIXME: Set encoding to UTF-8 before parsing.
{ {
@ -5936,6 +5938,7 @@ void MyFrame::OnAssociate ( wxCommandEvent& event )
} }
else else
return; return;
XmlEncodingHandler::set ( modifiedBuffer, origEncoding );
doc->SetTextRaw ( modifiedBuffer.c_str() ); doc->SetTextRaw ( modifiedBuffer.c_str() );
doc->SetFocus(); doc->SetFocus();
} }
@ -5951,7 +5954,7 @@ void MyFrame::openRememberedTabs()
wxArrayString::iterator vit; wxArrayString::iterator vit;
for ( vit = v.begin(); vit != v.end(); vit++ ) for ( vit = v.begin(); vit != v.end(); vit++ )
{ {
if ( vit->Empty() || !openFile ( *vit ) ) if ( vit->IsEmpty() || !openFile ( *vit ) )
continue; //break; // Ignore errors continue; //break; // Ignore errors
} }
XmlDoc *doc; XmlDoc *doc;