aboutsummaryrefslogtreecommitdiff
path: root/src/function/transform.cc
diff options
context:
space:
mode:
authorAdrian Kummerlaender2014-07-07 22:25:03 +0200
committerAdrian Kummerlaender2014-07-07 22:25:03 +0200
commit8f05c7de54336daefb214a754de35367098b6510 (patch)
treefc8d2b8309c88a1e57193784ad4f48bfa573952d /src/function/transform.cc
parentbe99b28838796ff5e1dc91685d6121a55d962a88 (diff)
downloadInputXSLT-8f05c7de54336daefb214a754de35367098b6510.tar
InputXSLT-8f05c7de54336daefb214a754de35367098b6510.tar.gz
InputXSLT-8f05c7de54336daefb214a754de35367098b6510.tar.bz2
InputXSLT-8f05c7de54336daefb214a754de35367098b6510.tar.lz
InputXSLT-8f05c7de54336daefb214a754de35367098b6510.tar.xz
InputXSLT-8f05c7de54336daefb214a754de35367098b6510.tar.zst
InputXSLT-8f05c7de54336daefb214a754de35367098b6510.zip
Implemented custom xercesc::DOMDocument deleter
* pointers to xercesc::DOMDocument were manually released ** this is now solved using a custom deleter for the appropriate std::unqiue_ptr template specialization * added matching factory method to DomDocumentCache * updated external function implementations accordingly ** "constructDocument" is now expected to return a DomDocumentCache::document_ptr instance * updated TransformerFacade accordingly * this change was implemented to get rid of the manual memory management required by xalan / xerces
Diffstat (limited to 'src/function/transform.cc')
-rw-r--r--src/function/transform.cc18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/function/transform.cc b/src/function/transform.cc
index e53b55f..c97897e 100644
--- a/src/function/transform.cc
+++ b/src/function/transform.cc
@@ -2,10 +2,6 @@
#include <xalanc/XercesParserLiaison/FormatterToXercesDOM.hpp>
-#include <xercesc/dom/DOMDocument.hpp>
-#include <xercesc/dom/DOMImplementation.hpp>
-#include <xercesc/dom/DOMElement.hpp>
-
#include "transformer_facade.h"
#include "support/xerces_string_guard.h"
#include "support/dom/result_node_facade.h"
@@ -30,28 +26,24 @@ inline void handleErrors(
namespace InputXSLT {
-xercesc::DOMDocument* FunctionTransform::constructDocument(
+DomDocumentCache::document_ptr FunctionTransform::constructDocument(
xalan::XSLTInputSource inputSource,
xalan::XSLTInputSource transformationSource
) {
- xercesc::DOMDocument* const domDocument(
- xercesc::DOMImplementation::getImplementation()->createDocument(
- nullptr,
- *XercesStringGuard<XMLCh>("content"),
- nullptr
- )
+ DomDocumentCache::document_ptr domDocument(
+ DomDocumentCache::createDocument()
);
xercesc::DOMElement* const rootElement(
domDocument->getDocumentElement()
);
- ResultNodeFacade result(domDocument, rootElement, "transformation");
+ ResultNodeFacade result(domDocument.get(), rootElement, "transformation");
TransformerFacade transformer(this->include_resolver_);
try {
xalan::FormatterToXercesDOM targetFormatter(
- domDocument,
+ domDocument.get(),
result.getResultElement()
);