diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-23 15:12:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-02 08:17:00 +0100 |
| commit | 8c5ffecf1dbd3f93128910433da11d5315661680 (patch) | |
| tree | 4263d40f2e6e118f42b7eed7bc40e92ad504036d /xmloff/source/draw/sdxmlimp.cxx | |
| parent | 0f3a8a972421aa440f4276b92463a481e5cd4267 (diff) | |
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/draw/sdxmlimp.cxx')
| -rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 60db53160082..ae5dba2c6639 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -59,9 +59,6 @@ public: SdXMLBodyContext_Impl( SdXMLImport& rImport ); - virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) 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; }; @@ -94,13 +91,6 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; - - virtual void SAL_CALL characters( const OUString& /*aChars*/ ) override {} - - virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& /*xAttrList*/ ) override {} - - virtual void SAL_CALL endFastElement( sal_Int32 /*nElement*/ ) override {} }; } @@ -193,13 +183,6 @@ public: SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport, const uno::Reference<document::XDocumentProperties>& i_xDocProps ); - virtual void SAL_CALL startFastElement( sal_Int32 nElement, - const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; - - virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override; - - virtual void SAL_CALL characters( const OUString& aChars ) override; - virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) override; }; @@ -214,22 +197,6 @@ SdXMLFlatDocContext_Impl::SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport, { } -void SAL_CALL SdXMLFlatDocContext_Impl::startFastElement( sal_Int32 nElement, - const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) -{ - SvXMLMetaDocumentContext::startFastElement(nElement, xAttrList); -} - -void SAL_CALL SdXMLFlatDocContext_Impl::endFastElement( sal_Int32 nElement ) -{ - SvXMLMetaDocumentContext::endFastElement(nElement); -} - -void SAL_CALL SdXMLFlatDocContext_Impl::characters( const OUString& rChars ) -{ - SvXMLMetaDocumentContext::characters(rChars); -} - uno::Reference< xml::sax::XFastContextHandler > SAL_CALL SdXMLFlatDocContext_Impl::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& xAttrList ) { |