diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-19 08:10:23 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-09-19 08:12:21 +0200 |
| commit | f5ef612a6aa78481d67718ed20ab058d8ae2dcdb (patch) | |
| tree | 57e5221bd239e9c7a8a7a18f58f62a5bf156f95c | |
| parent | beed6cb8add346c017de212c5ee18fa786caed8b (diff) | |
Use FastSaxParser directly
Change-Id: I2f21438a0ccc6bc096f3257c48e088c4114d9f45
| -rw-r--r-- | sax/CppunitTest_sax_parser.mk | 2 | ||||
| -rw-r--r-- | sax/qa/cppunit/parser.cxx | 13 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk index d5ede466dc8b..a926121edaf3 100644 --- a/sax/CppunitTest_sax_parser.mk +++ b/sax/CppunitTest_sax_parser.mk @@ -17,6 +17,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \ comphelper \ cppu \ cppuhelper \ + expwrap \ sal \ test \ $(gb_UWINAPI) \ @@ -35,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_components,sax_parser,\ configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ - sax/source/expatwrap/expwrap \ sfx2/util/sfx \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index c6a32c56a949..5674b11403e4 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -10,12 +10,12 @@ #include <sal/config.h> #include <com/sun/star/io/Pipe.hpp> -#include <com/sun/star/xml/sax/FastParser.hpp> #include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> -#include <com/sun/star/xml/sax/XFastParser.hpp> +#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> #include <cppuhelper/implbase1.hxx> +#include <sax/fastparser.hxx> #include <test/bootstrapfixture.hxx> using namespace css; @@ -57,7 +57,7 @@ public: class ParserTest: public test::BootstrapFixture { InputSource maInput; - uno::Reference< XFastParser > mxParser; + sax_fastparser::FastSaxParser maParser; uno::Reference< XFastDocumentHandler > mxDocumentHandler; uno::Reference< DummyTokenHandler > mxTokenHandler; @@ -78,9 +78,8 @@ private: void ParserTest::setUp() { test::BootstrapFixture::setUp(); - mxParser = css::xml::sax::FastParser::create(m_xContext); mxTokenHandler.set( new DummyTokenHandler() ); - mxParser->setTokenHandler( mxTokenHandler ); + maParser.setTokenHandler( mxTokenHandler ); } void ParserTest::tearDown() @@ -102,13 +101,13 @@ uno::Reference< io::XInputStream > ParserTest::createStream(const OString& sInpu void ParserTest::parse() { maInput.aInputStream = createStream("<a>...<b />..</a>"); - mxParser->parseStream( maInput ); + maParser.parseStream( maInput ); maInput.aInputStream = createStream("<b></a>"); bool bException = false; try { - mxParser->parseStream( maInput ); + maParser.parseStream( maInput ); } catch (const SAXParseException &) { |