diff options
| author | Mohammed Abdul Azeem <azeemmysore@gmail.com> | 2017-06-27 00:46:25 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2017-06-27 17:51:33 +0200 |
| commit | c44d9f9e627eb074367cc47ae4742aedea44c370 (patch) | |
| tree | 140d8cbef8335d416e2d6cb2a836ee60c56ceeef /sc/source/filter/xml/xmlimprt.cxx | |
| parent | d109948f0dd4190d7aca1e0fa7e2706ef3f40a6c (diff) | |
Using fast tokens directly:
Replacing integer-to-integer mapped tokens with
fast Tokens direcly for branching.
Adding a macro XML_ELEMENT that combines namespace
and element tokens.
Change-Id: I8701c8af9607392843460fe726bffb6556cf9b33
Reviewed-on: https://gerrit.libreoffice.org/39275
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'sc/source/filter/xml/xmlimprt.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmlimprt.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index c777658a65cf..badfa59d22ad 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -332,7 +332,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL ScXMLFlatDocContext_Impl::createFastChildContext( sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) { - if ( nElement != ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_META ) ) + if ( nElement != XML_ELEMENT( OFFICE, XML_META ) ) return ScXMLDocContext_Impl::createFastChildContext( nElement, xAttrList ); else return new SvXMLImportContext( GetImport() ); @@ -422,10 +422,9 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL { SvXMLImportContext *pContext(nullptr); - const SvXMLTokenMap& rTokenMap(GetScImport().GetDocElemTokenMap()); - switch( rTokenMap.Get( nElement ) ) + switch( nElement ) { - case XML_TOK_DOC_BODY: + case XML_ELEMENT( OFFICE, XML_BODY ): if (GetScImport().getImportFlags() & SvXMLImportFlags::CONTENT) pContext = new ScXMLBodyContext_Impl( GetScImport() ); break; @@ -2046,13 +2045,13 @@ SvXMLImportContext *ScXMLImport::CreateFastContext( sal_Int32 nElement, switch( nElement ) { - case ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_DOCUMENT_STYLES ): - case ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_DOCUMENT_CONTENT ): - case ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_DOCUMENT_SETTINGS ): + case XML_ELEMENT( OFFICE, XML_DOCUMENT_STYLES ): + case XML_ELEMENT( OFFICE, XML_DOCUMENT_CONTENT ): + case XML_ELEMENT( OFFICE, XML_DOCUMENT_SETTINGS ): pContext = new ScXMLDocContext_Impl( *this ); break; - case ( NAMESPACE_TOKEN( XML_NAMESPACE_OFFICE ) | XML_DOCUMENT ): + case XML_ELEMENT( OFFICE, XML_DOCUMENT ): { uno::Reference<document::XDocumentPropertiesSupplier> xDPS( GetModel(), uno::UNO_QUERY_THROW); |