sw/source/filter/xml/xmlfmt.cxx | 4 ++-- xmloff/source/draw/ximpstyl.cxx | 2 +- xmloff/source/draw/ximpstyl.hxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit af068c36c65f8ed482e774fcf5346704ae7a2717 Author: Noel Grandin <[email protected]> AuthorDate: Thu Aug 20 21:37:56 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Aug 21 08:13:27 2020 +0200 use fastparser in SdXMLStylesContext Change-Id: Idd15d117d71e607691bec9911ff0cc194ca5ce01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101093 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 51058a1f36d1..6aee9df7f8ac 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1076,7 +1076,7 @@ rtl::Reference< SvXMLImportPropertyMapper > SdXMLStylesContext::GetImportPropert // Process all style and object info -void SdXMLStylesContext::EndElement() +void SdXMLStylesContext::endFastElement(sal_Int32 ) { if(mbIsAutoStyle) { diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index 3885d405141b..d3922a8eb326 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -210,7 +210,7 @@ public: SdXMLImport& rImport, bool bIsAutoStyle); - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; virtual rtl::Reference< SvXMLImportPropertyMapper > GetImportPropertyMapper(XmlStyleFamily nFamily) const override; void SetMasterPageStyles(SdXMLMasterPageContext const & rMaster) const; commit 8d3ccf54fe47be0167505afb11159fd2e1fa1d9f Author: Noel Grandin <[email protected]> AuthorDate: Thu Aug 20 21:34:54 2020 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Fri Aug 21 08:13:16 2020 +0200 use fastparser in SwXMLMasterStylesContext_Impl Change-Id: I420312d8f58a42999c7d6c3048c391ff1f44a039 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101092 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 559984a60ff2..5bd4debc2d27 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -993,7 +993,7 @@ public: SwXMLMasterStylesContext_Impl( SwXMLImport& rImport ); - virtual void EndElement() override; + virtual void SAL_CALL endFastElement(sal_Int32 nElement) override; }; } @@ -1018,7 +1018,7 @@ bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( XmlStyleFamily nFamily ) return bIns; } -void SwXMLMasterStylesContext_Impl::EndElement() +void SwXMLMasterStylesContext_Impl::endFastElement(sal_Int32 ) { FinishStyles( !GetSwImport().IsInsertMode() ); GetSwImport().FinishStyles(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
