diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-12-04 19:42:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-12-04 20:19:32 +0100 |
| commit | ef80ef57f50cf41afa461fc8c188e40436194f1a (patch) | |
| tree | 0a7f949aff33d54e8ec9d56dc563c8948028e95f /xmloff | |
| parent | 62887aa764e51a74d3b452abd2297a05d9a6bd3f (diff) | |
call createFastChildContextFallback in more places
to make my fastparser work easier to manage
Change-Id: If98592f016cd35ca13b48d9df363e32fb1095b55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107233
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/XMLNumberStyles.cxx | 10 | ||||
| -rw-r--r-- | xmloff/source/table/XMLTableImport.cxx | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 1696fc038ac8..44c85b8e2bfd 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -492,7 +492,7 @@ private: bool mbTextual; bool mbDecimal02; OUString maText; - css::uno::Reference< css::xml::sax::XFastContextHandler > mxSlaveContext; + SvXMLImportContextRef mxSlaveContext; public: @@ -500,7 +500,7 @@ public: sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, - const css::uno::Reference< css::xml::sax::XFastContextHandler >& rSlaveContext ); + const SvXMLImportContextRef& rSlaveContext ); virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override; @@ -519,7 +519,7 @@ SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, - const css::uno::Reference< css::xml::sax::XFastContextHandler >& rSlaveContext ) + const SvXMLImportContextRef& rSlaveContext ) : SvXMLImportContext(rImport), mpParent( pParent ), maNumberStyle( SvXMLImport::getNameFromToken(nElement) ), @@ -555,7 +555,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SdXMLNumberFormatMembe sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) { - return mxSlaveContext->createFastChildContext( nElement, xAttrList ); + return mxSlaveContext->createFastChildContextFallback( nElement, xAttrList ); } void SdXMLNumberFormatMemberImportContext::startFastElement( @@ -707,7 +707,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > SdXMLNumberFormatImpor const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ) { return new SdXMLNumberFormatMemberImportContext( GetImport(), nElement, xAttrList, - this, SvXMLNumFormatContext::createFastChildContext( nElement, xAttrList ) ); + this, &dynamic_cast<SvXMLImportContext&>(*SvXMLNumFormatContext::createFastChildContext( nElement, xAttrList )) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index af931822cbe6..7a54c1478acc 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -199,7 +199,7 @@ SvXMLImportContextRef XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, c css::uno::Reference< css::xml::sax::XFastContextHandler > XMLProxyContext::createFastChildContext( sal_Int32 nElement, const Reference< XFastAttributeList >& xAttrList ) { if( mxParent.is() ) - return mxParent->createFastChildContext( nElement, xAttrList ); + return mxParent->createFastChildContextFallback( nElement, xAttrList ); return nullptr; } |