From 8c5ffecf1dbd3f93128910433da11d5315661680 Mon Sep 17 00:00:00 2001 From: Noel Date: Fri, 23 Oct 2020 15:12:22 +0200 Subject: make SvXMLImport capable of mixing fast- and slow- contexts adhoc so I can convert even *ImportContext subclasses in the middle of a context stack, and thus break the cyclic dependency nature of the writer import. and adjust the xmlimport loplugin for the new rules. As a consequence of the loplugin:xmlimport's checking, we remove a bunch of now unnecessary overrides of startFastElement. Change-Id: I97464522ede8ec5e345e928cdafa4b18364b1b80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104730 Tested-by: Jenkins Reviewed-by: Noel Grandin --- linguistic/source/convdicxml.cxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'linguistic/source') diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index f7503732465f..bc9aede1c32b 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -85,10 +85,6 @@ public: } // SvXMLImportContext - virtual void SAL_CALL startFastElement( - sal_Int32 /*nElement*/, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& /*xAttrList*/ ) override {} - virtual void SAL_CALL characters( const OUString &rChars ) override; virtual css::uno::Reference SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) override; }; @@ -156,8 +152,8 @@ public: } -void ConvDicXMLImportContext::characters(const OUString & /*rChars*/) -{ +//void ConvDicXMLImportContext::characters(const OUString & /*rChars*/) +//{ /* Whitespace occurring within the content of token elements is "trimmed" from the ends (i.e. all whitespace at the beginning and end of the @@ -166,7 +162,7 @@ void ConvDicXMLImportContext::characters(const OUString & /*rChars*/) */ //collapsing not done yet! -} +//} css::uno::Reference ConvDicXMLImportContext::createFastChildContext( sal_Int32 Element, -- cgit v1.2.3