diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-06-01 13:41:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-06-01 15:07:18 +0200 |
| commit | e899a75fc6dd600ea9992c851a42734b334122b6 (patch) | |
| tree | 1a54173803fc304f8af8802654ec147c6e6ad38d /oox/source | |
| parent | 020d72fb85dac7a52eacb29731b8f2d536a2892d (diff) | |
Revert "Convert XFastParser into a normal C++ interface"
This reverts commit 5e68d6cfade45f40b1ad46025a81afe4cb8dd337.
Reason for revert: Seems like outside users have been using this API
Change-Id: I8814cf1eb4f000eeb4cbbb5db9c282d001465993
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152441
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/core/fastparser.cxx | 1 | ||||
| -rw-r--r-- | oox/source/crypto/AgileEngine.cxx | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx index 22ba37c7d671..53e5eb78a849 100644 --- a/oox/source/core/fastparser.cxx +++ b/oox/source/core/fastparser.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/xml/sax/InputSource.hpp> #include <oox/core/fastparser.hxx> #include <oox/core/fasttokenhandler.hxx> diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx index 7a667943d8e2..f7518498171d 100644 --- a/oox/source/crypto/AgileEngine.cxx +++ b/oox/source/crypto/AgileEngine.cxx @@ -26,12 +26,11 @@ #include <tools/stream.hxx> #include <tools/XmlWriter.hxx> #include <sax/fastattribs.hxx> -#include <sax/fastparser.hxx> +#include <com/sun/star/xml/sax/XFastParser.hpp> #include <com/sun/star/xml/sax/XFastTokenHandler.hpp> -#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp> +#include <com/sun/star/xml/sax/FastParser.hpp> #include <com/sun/star/xml/sax/FastToken.hpp> -#include <com/sun/star/xml/sax/InputSource.hpp> using namespace css; using namespace css::beans; @@ -522,7 +521,7 @@ bool AgileEngine::readEncryptionInfo(uno::Reference<io::XInputStream> & rxInputS Reference<XFastDocumentHandler> xFastDocumentHandler(new AgileDocumentHandler(mInfo)); Reference<XFastTokenHandler> xFastTokenHandler(new AgileTokenHandler); - rtl::Reference<sax_fastparser::FastSaxParser> xParser = new sax_fastparser::FastSaxParser; + Reference<XFastParser> xParser(css::xml::sax::FastParser::create(comphelper::getProcessComponentContext())); xParser->setFastDocumentHandler(xFastDocumentHandler); xParser->setTokenHandler(xFastTokenHandler); |