diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-20 17:10:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-20 18:22:26 +0200 |
| commit | 764d52045b0a28e071f214fb1334b7a0c05df6bd (patch) | |
| tree | 02f5cb1e761745e065fe6b60fea1f4818984dcf3 /include | |
| parent | Base addon toolbars on the regular ToolBarManager (diff) | |
| download | core-764d52045b0a28e071f214fb1334b7a0c05df6bd.tar.gz core-764d52045b0a28e071f214fb1334b7a0c05df6bd.zip | |
use fastparser in SvXMLNumFormatContext
which requires making SvXMLStylesContext capable of doing both
fast and slow-parser paths.
Change-Id: I57428b10ac2d67bc233cc978c9a0c0c3755d60e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101022
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/XMLFontStylesContext.hxx | 1 | ||||
| -rw-r--r-- | include/xmloff/XMLTextMasterStylesContext.hxx | 1 | ||||
| -rw-r--r-- | include/xmloff/xmlnumfi.hxx | 13 | ||||
| -rw-r--r-- | include/xmloff/xmlstyle.hxx | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index b10bf2797b14..3aad7826bcc3 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -45,6 +45,7 @@ class XMLOFF_DLLPUBLIC XMLFontStylesContext final : public SvXMLStylesContext rtl_TextEncoding eDfltEncoding; + using SvXMLStylesContext::CreateStyleChildContext; virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index 12975af36469..45b253759fde 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -27,6 +27,7 @@ class XMLOFF_DLLPUBLIC XMLTextMasterStylesContext : public SvXMLStylesContext { protected: + using SvXMLStylesContext::CreateStyleChildContext; virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index e428edc671ce..3170f8b8e7c1 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -83,9 +83,8 @@ public: ~SvXMLNumFmtHelper(); SvXMLStyleContext* CreateChildContext( SvXMLImport& rImport, - sal_uInt16 nPrefix, - const OUString& rLocalName, - const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, + sal_Int32 nElement, + const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList, SvXMLStylesContext& rStyles); SvXMLNumImpData* getData() { return pData.get(); } @@ -154,13 +153,19 @@ class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext public: SvXMLNumFormatContext( SvXMLImport& rImport, - sal_uInt16 nPrfx, + sal_uInt16 nPrfx, const OUString& rLName, SvXMLNumImpData* pNewData, SvXMLStylesTokens nNewType, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles ); SvXMLNumFormatContext( SvXMLImport& rImport, + sal_Int32 nElement, + SvXMLNumImpData* pNewData, + SvXMLStylesTokens nNewType, + const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList, + SvXMLStylesContext& rStyles ); + SvXMLNumFormatContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index 6ddf51d8872a..e02f2d81a674 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -191,6 +191,10 @@ protected: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); + virtual SvXMLStyleContext *CreateStyleChildContext( + sal_Int32 nElement, + const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList ); + virtual SvXMLStyleContext *CreateStyleStyleChildContext( XmlStyleFamily nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ); |