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

A left out file for "Fixed crashes in Xerces-C by using wide file names"

This commit is contained in:
Zane U. Ji 2013-10-20 00:05:44 +08:00
parent 3962f183f4
commit ed73d8dad0
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/xmlcopyeditor.cpp Executable file → Normal file
View File

@ -3076,13 +3076,14 @@ bool MyFrame::openFile ( wxString& fileName, bool largeFile )
//wxMemoryMappedFile *memorymap = NULL; //wxMemoryMappedFile *memorymap = NULL;
BinaryFile *binaryfile = NULL; BinaryFile *binaryfile = NULL;
binaryfile = new BinaryFile ( ( const char * ) fileName.mb_str ( wxConvLocal ) ); binaryfile = new BinaryFile ( fileName );
if ( !binaryfile->getData() ) if ( !binaryfile->getData() )
{ {
wxString message; wxString message;
message.Printf ( _ ( "Cannot open %s" ), fileName.c_str() ); message.Printf ( _ ( "Cannot open %s" ), fileName.c_str() );
messagePane ( message, CONST_STOP ); messagePane ( message, CONST_STOP );
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
delete binaryfile;
return false; return false;
} }
/* /*
@ -5859,36 +5860,28 @@ void MyFrame::updatePaths()
wxFileName::GetPathSeparator(); wxFileName::GetPathSeparator();
daisyDir = applicationDir + wxFileName::GetPathSeparator() + _T ( "daisy" ) + daisyDir = applicationDir + wxFileName::GetPathSeparator() + _T ( "daisy" ) +
wxFileName::GetPathSeparator(); wxFileName::GetPathSeparator();
wxString wideCatalogPath = catalogPath =
applicationDir + wxFileName::GetPathSeparator() + _T ( "catalog" ) + applicationDir + wxFileName::GetPathSeparator() + _T ( "catalog" ) +
wxFileName::GetPathSeparator() + _T ( "catalog" ); wxFileName::GetPathSeparator() + _T ( "catalog" );
catalogPath = wideCatalogPath.mb_str ( wxConvLocal ); xslDtdPath =
wxString wideXslDtdPath =
applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) + applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) +
wxFileName::GetPathSeparator() + _T ( "xslt10.dtd" ); wxFileName::GetPathSeparator() + _T ( "xslt10.dtd" );
xslDtdPath = wideXslDtdPath.mb_str ( wxConvLocal ); rssDtdPath =
wxString wideRssDtdPath =
applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) + applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) +
wxFileName::GetPathSeparator() + _T ( "rss2.dtd" ); wxFileName::GetPathSeparator() + _T ( "rss2.dtd" );
rssDtdPath = wideRssDtdPath.mb_str ( wxConvLocal ); xtmDtdPath =
wxString wideXtmDtdPath =
applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) + applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) +
wxFileName::GetPathSeparator() + _T ( "xtm1.dtd" ); wxFileName::GetPathSeparator() + _T ( "xtm1.dtd" );
xtmDtdPath = wideXtmDtdPath.mb_str ( wxConvLocal ); lzxDtdPath =
wxString wideLzxDtdPath =
applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) + applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) +
wxFileName::GetPathSeparator() + _T ( "lzx.dtd" ); wxFileName::GetPathSeparator() + _T ( "lzx.dtd" );
lzxDtdPath = wideLzxDtdPath.mb_str ( wxConvLocal ); xliffDtdPath =
wxString wideXliffDtdPath =
applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) + applicationDir + wxFileName::GetPathSeparator() + _T ( "dtd" ) +
wxFileName::GetPathSeparator() + _T ( "xliff.dtd" ); wxFileName::GetPathSeparator() + _T ( "xliff.dtd" );
xliffDtdPath = wideXliffDtdPath.mb_str ( wxConvLocal ); aspellDataPath = applicationDir + wxFileName::GetPathSeparator() +
wxString wideAspellDataPath = applicationDir + wxFileName::GetPathSeparator() +
_T ( "aspell" ) + wxFileName::GetPathSeparator() + _T ( "data" ); _T ( "aspell" ) + wxFileName::GetPathSeparator() + _T ( "data" );
aspellDataPath = wideAspellDataPath.mb_str ( wxConvLocal ); aspellDictPath = applicationDir + wxFileName::GetPathSeparator() +
wxString wideAspellDictPath = applicationDir + wxFileName::GetPathSeparator() +
_T ( "aspell" ) + wxFileName::GetPathSeparator() + _T ( "dict" ); _T ( "aspell" ) + wxFileName::GetPathSeparator() + _T ( "dict" );
aspellDictPath = wideAspellDictPath.mb_str ( wxConvLocal );
} }
void MyFrame::OnAssociate ( wxCommandEvent& event ) void MyFrame::OnAssociate ( wxCommandEvent& event )
@ -6185,21 +6178,21 @@ wxString MyFrame::getAuxPath ( const wxString& fileName )
{ {
if ( fileName.Find ( _T ( ".xsl" ) ) != wxNOT_FOUND || if ( fileName.Find ( _T ( ".xsl" ) ) != wxNOT_FOUND ||
fileName.Find ( _T ( ".XSL" ) ) != wxNOT_FOUND ) fileName.Find ( _T ( ".XSL" ) ) != wxNOT_FOUND )
return wxString ( xslDtdPath.c_str(), wxConvUTF8 ); return xslDtdPath;
else if ( fileName.Find ( _T ( ".rss" ) ) != wxNOT_FOUND || else if ( fileName.Find ( _T ( ".rss" ) ) != wxNOT_FOUND ||
fileName.Find ( _T ( ".RSS" ) ) != wxNOT_FOUND ) fileName.Find ( _T ( ".RSS" ) ) != wxNOT_FOUND )
return wxString ( rssDtdPath.c_str(), wxConvUTF8 ); return rssDtdPath;
else if ( fileName.Find ( _T ( ".xtm" ) ) != wxNOT_FOUND || else if ( fileName.Find ( _T ( ".xtm" ) ) != wxNOT_FOUND ||
fileName.Find ( _T ( ".xtmm" ) ) != wxNOT_FOUND || fileName.Find ( _T ( ".xtmm" ) ) != wxNOT_FOUND ||
fileName.Find ( _T ( ".XTM" ) ) != wxNOT_FOUND || fileName.Find ( _T ( ".XTM" ) ) != wxNOT_FOUND ||
fileName.Find ( _T ( ".XTMM" ) ) != wxNOT_FOUND ) fileName.Find ( _T ( ".XTMM" ) ) != wxNOT_FOUND )
return wxString ( xtmDtdPath.c_str(), wxConvUTF8 ); return xtmDtdPath;
else if ( fileName.Find ( _T ( ".lzx" ) ) != wxNOT_FOUND || else if ( fileName.Find ( _T ( ".lzx" ) ) != wxNOT_FOUND ||
fileName.Find ( _T ( ".LZX" ) ) != wxNOT_FOUND ) fileName.Find ( _T ( ".LZX" ) ) != wxNOT_FOUND )
return wxString ( lzxDtdPath.c_str(), wxConvUTF8 ); return lzxDtdPath;
else if ( fileName.Find ( _T ( ".xlf" ) ) != wxNOT_FOUND || else if ( fileName.Find ( _T ( ".xlf" ) ) != wxNOT_FOUND ||
fileName.Find ( _T ( ".XLF" ) ) != wxNOT_FOUND ) fileName.Find ( _T ( ".XLF" ) ) != wxNOT_FOUND )
return wxString ( xliffDtdPath.c_str(), wxConvUTF8 ); return xliffDtdPath;
return wxEmptyString; return wxEmptyString;
} }