diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2023-05-29 20:24:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-06-01 11:59:06 +0200 |
| commit | 5e68d6cfade45f40b1ad46025a81afe4cb8dd337 (patch) | |
| tree | af7740f3636e6b303371c764bfe7ff083e847879 /oox/source | |
| parent | f15a6e1b1b186bf42e1ade05630d17841add2c46 (diff) | |
Convert XFastParser into a normal C++ interface
There is no need for it to be an UNO interface anymore (ever since
we started supporting dynamic_cast on UNO objects).
Which means that XImportFilter2 also needs become a C++ interface.
Change-Id: Ice2db0f098271bba32b199bd083b08cb8410ce93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152388
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, 5 insertions, 3 deletions
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx index 53e5eb78a849..22ba37c7d671 100644 --- a/oox/source/core/fastparser.cxx +++ b/oox/source/core/fastparser.cxx @@ -20,6 +20,7 @@ #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 f7518498171d..7a667943d8e2 100644 --- a/oox/source/crypto/AgileEngine.cxx +++ b/oox/source/crypto/AgileEngine.cxx @@ -26,11 +26,12 @@ #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/FastParser.hpp> +#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp> #include <com/sun/star/xml/sax/FastToken.hpp> +#include <com/sun/star/xml/sax/InputSource.hpp> using namespace css; using namespace css::beans; @@ -521,7 +522,7 @@ bool AgileEngine::readEncryptionInfo(uno::Reference<io::XInputStream> & rxInputS Reference<XFastDocumentHandler> xFastDocumentHandler(new AgileDocumentHandler(mInfo)); Reference<XFastTokenHandler> xFastTokenHandler(new AgileTokenHandler); - Reference<XFastParser> xParser(css::xml::sax::FastParser::create(comphelper::getProcessComponentContext())); + rtl::Reference<sax_fastparser::FastSaxParser> xParser = new sax_fastparser::FastSaxParser; xParser->setFastDocumentHandler(xFastDocumentHandler); xParser->setTokenHandler(xFastTokenHandler); |