diff options
| author | Mohammed Abdul Azeem <azeemmysore@gmail.com> | 2016-09-02 01:18:53 +0530 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2016-09-05 16:24:59 +0000 |
| commit | 67ef208b2b586603e205105a384231645d7f6712 (patch) | |
| tree | 2f612397c3d5831b30cd49c393ce6e43a57856ac /include | |
| parent | 4e933ea84ec97ab5c4a353995c4c1ce7cdf54ea3 (diff) | |
Fixes for migrating SvXMLImport to use FastParser:
These are necessary for implementing fast interfaces
for the contexts.
Change-Id: I37655c85c76b42782a49eeea3140490213047341
Reviewed-on: https://gerrit.libreoffice.org/28641
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/xmlimp.hxx | 6 | ||||
| -rw-r--r-- | include/xmloff/xmltkmap.hxx | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index c673dfc1f86a..415ca40018fe 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -61,7 +61,7 @@ #include <o3tl/typed_flags_set.hxx> #include <memory> -#define NAMESPACE_TOKEN( prefixToken ) ( ( prefixToken + 1 ) << NMSP_SHIFT ) +#define NAMESPACE_TOKEN( prefixToken ) ( ( sal_Int32( prefixToken + 1 ) ) << NMSP_SHIFT ) const size_t NMSP_SHIFT = 16; const sal_Int32 TOKEN_MASK = 0xffff; @@ -191,6 +191,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper8< SvXMLImportFlags mnImportFlags; SvXMLErrorFlags mnErrorFlags; std::set< OUString > embeddedFontUrlsKnown; + bool isFastContext; css::uno::Reference< css::xml::sax::XFastParser > mxParser; rtl::Reference< SvXMLImportFastNamespaceHandler > maNamespaceHandler; css::uno::Reference< css::xml::sax::XFastTokenHandler > mxTokenHandler; @@ -199,6 +200,9 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper8< const OUString getNamespacePrefixFromToken( sal_Int32 nToken ); void registerNamespaces(); void registerNSHelper(sal_Int32 nToken, sal_Int32 nPrefix, sal_Int32 nNamespace ); + void processNSAttributes( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList, + SvXMLNamespaceMap *pRewindMap ); + void Characters(const OUString& aChars); protected: diff --git a/include/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx index 89cfd6584d1a..c9f0bee56136 100644 --- a/include/xmloff/xmltkmap.hxx +++ b/include/xmloff/xmltkmap.hxx @@ -44,7 +44,7 @@ struct SvXMLTokenMapEntry nPrefixKey( nPrefix ), eLocalName( eName ), nToken( nTok ), - nFastToken( sal_uInt32( nPrefixKey + 1 ) << 16 | eLocalName ) + nFastToken( ( sal_Int32( nPrefixKey + 1 ) ) << 16 | eLocalName ) { if ( nFastTok ) // alternative value for duplicate/dummy tokens nFastToken = nFastTok; |