xmloff/source/draw/ximpshap.cxx | 11 ++++++-----
xmloff/source/draw/ximpshap.hxx | 3 ++-
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 3b8ce394593fa4acfb1336b2b4cc3f32f67f4932
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Dec 4 20:26:02 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Dec 5 08:16:52 2020 +0100
fastparser in SdXMLTableShapeContext
Change-Id: Ia27408ff3f640de942f42718e2ee497350f48785
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107237
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 476c3ec006e7..520bc682e6bf 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -4018,12 +4018,13 @@ void SdXMLTableShapeContext::processAttribute(
sal_uInt16 nPrefix, const OUStrin
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
}
-SvXMLImportContextRef SdXMLTableShapeContext::CreateChildContext( sal_uInt16
nPrefix, const OUString& rLocalName, const
uno::Reference<xml::sax::XAttributeList>& xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler >
SdXMLTableShapeContext::createFastChildContext(
+ sal_Int32 nElement,
+ const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
{
- if( mxTableImportContext.is() && (nPrefix == XML_NAMESPACE_TABLE) )
- return mxTableImportContext->CreateChildContext(nPrefix, rLocalName,
xAttrList);
- else
- return SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName,
xAttrList);
+ if( mxTableImportContext.is() && IsTokenInNamespace(nElement,
XML_NAMESPACE_TABLE) )
+ return mxTableImportContext->createFastChildContextFallback(nElement,
xAttrList);
+ return SdXMLShapeContext::createFastChildContext(nElement, xAttrList);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 31a15323e625..49d70c5b3c37 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -625,7 +625,8 @@ public:
const css::uno::Reference< css::xml::sax::XFastAttributeList >&
xAttrList ) override;
virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
- 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;
// this is called from the parent group for each unparsed attribute in the
attribute list
virtual void processAttribute( sal_uInt16 nPrefix, const OUString&
rLocalName, const OUString& rValue ) override;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
