From 994626d09ac4e06f3475a53893f069bf8b919e2d Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 7 Aug 2022 14:54:36 +0100 Subject: Use simplified XmlDocumentSerializer interface --- icespider/xslt/xsltStreamSerializer.cpp | 12 ++---------- icespider/xslt/xsltStreamSerializer.h | 3 --- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/icespider/xslt/xsltStreamSerializer.cpp b/icespider/xslt/xsltStreamSerializer.cpp index e210685..b5e6c30 100644 --- a/icespider/xslt/xsltStreamSerializer.cpp +++ b/icespider/xslt/xsltStreamSerializer.cpp @@ -57,21 +57,13 @@ namespace IceSpider { return std::make_shared(strm, stylesheet); } - XsltStreamSerializer::XsltStreamSerializer(std::ostream & os, xsltStylesheet * ss) : - Slicer::XmlDocumentSerializer(doc), strm(os), doc(nullptr), stylesheet(ss) - { - } - - XsltStreamSerializer::~XsltStreamSerializer() - { - delete doc; - } + XsltStreamSerializer::XsltStreamSerializer(std::ostream & os, xsltStylesheet * ss) : strm(os), stylesheet(ss) { } void XsltStreamSerializer::Serialize(Slicer::ModelPartForRootPtr mp) { Slicer::XmlDocumentSerializer::Serialize(mp); - auto result = xsltApplyStylesheet(stylesheet, doc->cobj(), nullptr); + auto result = xsltApplyStylesheet(stylesheet, doc.cobj(), nullptr); if (!result) { throw xmlpp::exception("Failed to apply XSL transform"); } diff --git a/icespider/xslt/xsltStreamSerializer.h b/icespider/xslt/xsltStreamSerializer.h index 429b73c..89e41a9 100644 --- a/icespider/xslt/xsltStreamSerializer.h +++ b/icespider/xslt/xsltStreamSerializer.h @@ -31,14 +31,11 @@ namespace IceSpider { }; XsltStreamSerializer(std::ostream &, xsltStylesheet *); - SPECIAL_MEMBERS_DELETE(XsltStreamSerializer); - ~XsltStreamSerializer() override; void Serialize(Slicer::ModelPartForRootPtr mp) override; protected: std::ostream & strm; - xmlpp::Document * doc; xsltStylesheet * stylesheet; }; } -- cgit v1.2.3