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

Bug #212 XSLT insert elements

This commit is contained in:
Zane U. Ji 2014-08-21 22:58:40 +08:00
parent 89be46ab2f
commit 412479f400
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/xmlpromptgenerator.cpp
View File

@ -405,20 +405,6 @@ int XMLCALL XmlPromptGenerator::externalentityrefhandler (
XmlPromptGenerator *pThis = ( XmlPromptGenerator * ) p; XmlPromptGenerator *pThis = ( XmlPromptGenerator * ) p;
PromptGeneratorData *d = pThis->d.get(); PromptGeneratorData *d = pThis->d.get();
// Either EXPAT or Xerces-C++ is capable of parsing DTDs. The advantage
// of Xerces-C++ is that it can access DTDs that are on the internet.
#if !PREFER_EXPAT_TO_XERCES_C
return pThis->parseGrammar
( d
, wxString::FromUTF8 ( publicId )
, wxString::FromUTF8 ( systemId )
, d->basePath
, Grammar::DTDGrammarType
);
#else // !PREFER_EXPAT_TO_XERCES_C
int ret; int ret;
std::string buffer; std::string buffer;
@ -441,6 +427,20 @@ int XMLCALL XmlPromptGenerator::externalentityrefhandler (
return ret; return ret;
} }
// Either EXPAT or Xerces-C++ is capable of parsing DTDs. The advantage
// of Xerces-C++ is that it can access DTDs that are on the internet.
#if !PREFER_EXPAT_TO_XERCES_C
return pThis->parseGrammar
( d
, wxString::FromUTF8 ( publicId )
, wxString::FromUTF8 ( systemId )
, d->basePath
, Grammar::DTDGrammarType
);
#else // !PREFER_EXPAT_TO_XERCES_C
wxString widePublicId ( publicId, wxConvUTF8 ); wxString widePublicId ( publicId, wxConvUTF8 );
wxString wideSystemId ( systemId, wxConvUTF8 ); wxString wideSystemId ( systemId, wxConvUTF8 );
CatalogResolver cr; CatalogResolver cr;