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

Fixed "DTD not found" problem

This commit is contained in:
Zane U. Ji 2013-11-06 19:43:04 +08:00
parent 649b3593fb
commit f73803ab6d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wraplibxml.cpp
View File

@ -42,6 +42,7 @@ public:
LIBXML_TEST_VERSION LIBXML_TEST_VERSION
xmlInitializeCatalog(); xmlInitializeCatalog();
xmlLoadCatalog ( catalogPath.mb_str() );
::catalog = xmlLoadACatalog ( catalogPath.mb_str() ); ::catalog = xmlLoadACatalog ( catalogPath.mb_str() );
initGenericErrorDefaultFunc ( NULL ); initGenericErrorDefaultFunc ( NULL );
@ -579,14 +580,16 @@ wxString WrapLibxml::catalogResolve
char *s = ( char * ) xmlACatalogResolve ( ::catalog, char *s = ( char * ) xmlACatalogResolve ( ::catalog,
( const xmlChar * ) ( const char *) publicId.utf8_str(), ( const xmlChar * ) ( const char *) publicId.utf8_str(),
( const xmlChar * ) ( const char *) systemId.utf8_str() ); ( const xmlChar * ) ( const char *) systemId.utf8_str() );
#ifndef __WXMSW__
if ( s == NULL ) if ( s == NULL )
{
#ifndef __WXMSW__
s = ( char * ) xmlCatalogResolve ( s = ( char * ) xmlCatalogResolve (
( const xmlChar * ) ( const char *) publicId.utf8_str(), ( const xmlChar * ) ( const char *) publicId.utf8_str(),
( const xmlChar * ) ( const char *) systemId.utf8_str() ); ( const xmlChar * ) ( const char *) systemId.utf8_str() );
#endif
if ( s == NULL ) if ( s == NULL )
#endif
return wxEmptyString; return wxEmptyString;
}
wxString url ( s, wxConvUTF8 ); wxString url ( s, wxConvUTF8 );
xmlFree ( s ); xmlFree ( s );