From 10e08b1d398e6aa91aa4ced0ca6c966349be8b5d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 14 Feb 2020 13:27:23 +0200 Subject: convert XMLEventsImportContext to fastparser for now, it supports both fast and non-fast methods, since it is constructed by both contexts Change-Id: I925c50be161b95ecebd951cb7038a938c848a15d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88715 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/xmloff/XMLEventsImportContext.hxx | 12 ++++++++++++ include/xmloff/xmlevent.hxx | 2 -- include/xmloff/xmlscripti.hxx | 5 ----- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index 0dd1a0194f4b..4b843015fa14 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -73,6 +73,10 @@ public: const OUString& rLocalName, const css::uno::Reference & xEventsSupplier); + XMLEventsImportContext( + SvXMLImport& rImport, + const css::uno::Reference & xEventsSupplier); + XMLEventsImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -112,6 +116,14 @@ protected: sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference & xAttrList ) override; + + virtual void SAL_CALL startFastElement( sal_Int32 nElement, + const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) override; + + virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override; + + virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( + sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; }; #endif diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx index 433d9b076201..ebbd400755fc 100644 --- a/include/xmloff/xmlevent.hxx +++ b/include/xmloff/xmlevent.hxx @@ -128,8 +128,6 @@ public: virtual SvXMLImportContext* CreateContext( SvXMLImport& rImport, /// import context - sal_uInt16 nPrefix, /// element: namespace prefix - const OUString& rLocalName, /// element: local name const css::uno::Reference & xAttrList, /// attribute list /// the context for the enclosing element XMLEventsImportContext* rEvents, diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx index 75b7115df526..06d2e3fcaafa 100644 --- a/include/xmloff/xmlscripti.hxx +++ b/include/xmloff/xmlscripti.hxx @@ -38,11 +38,6 @@ public: const css::uno::Reference< css::frame::XModel>& rDocModel ); virtual ~XMLScriptContext() override; - // Create child element. - virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, - const OUString& rLocalName, - const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; - virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; -- cgit