summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authordante <dante19031999@gmail.com>2020-12-19 18:39:54 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-12-26 08:21:58 +0100
commit9f6dfd50cb03b6511d4f711d284e1b75783d0b8b (patch)
treed40480227b9b07f574aa11ef26b53707f4bd6cb5 /xmloff
parent86707f3595c282f80b5e09558a23b539446daca2 (diff)
Improve handle of custom XML entities
Since 7.1 hasn't been released yet there's still time to change it before having to be scared about backguards compatibility. This way: - It is more efficient than passing two arguments - On definition it is simpler since both are declarated on same point. So it is simpler to not loose sync between lists. - Code is less long. - Thanks to an idea proposed by Stephan Bergmann on other commit. Change-Id: I16305a304c98eb8d4e11507c7938002da546778b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108028 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmlimp.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 5f1e7ec1b20a..9d3b1115f57e 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -544,10 +544,9 @@ void SAL_CALL SvXMLImport::setNamespaceHandler( const uno::Reference< xml::sax::
mxParser->setNamespaceHandler( Handler );
}
-void SAL_CALL SvXMLImport::setCustomEntityNames( const ::css::uno::Sequence< ::rtl::OUString >& names,
- const ::css::uno::Sequence< ::rtl::OUString >& replacements )
+void SAL_CALL SvXMLImport::setCustomEntityNames( const ::css::uno::Sequence< ::css::beans::Pair<::rtl::OUString, ::rtl::OUString> >& replacements )
{
- mxParser->setCustomEntityNames( names, replacements );
+ mxParser->setCustomEntityNames( replacements );
}
void SAL_CALL SvXMLImport::startDocument()