writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 +++++ 1 file changed, 5 insertions(+)
New commits: commit e8236945c0e26caf0148f108a74be8bd4bc28171 Author: Miklos Vajna <[email protected]> AuthorDate: Fri Dec 16 10:43:07 2022 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Dec 20 21:52:02 2022 +0000 writerfilter: fix crash in DomainMapper_Impl::convertFieldFormula() Crashreport signature: program/libwriterfilterlo.so writerfilter::dmapper::SettingsTable::GetListSeparator() const writerfilter/source/dmapper/SettingsTable.cxx:489 program/libwriterfilterlo.so writerfilter::dmapper::DomainMapper_Impl::convertFieldFormula(rtl::OUString const&) include/rtl/ustring.hxx:226 program/libwriterfilterlo.so writerfilter::dmapper::DomainMapper_Impl::handleFieldFormula(tools::SvRef<writerfilter::dmapper::FieldContext> const&, com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&) include/rtl/ustring.hxx:527 program/libwriterfilterlo.so writerfilter::dmapper::DomainMapper_Impl::CloseFieldCommand() writerfilter/source/dmapper/DomainMapper_Impl.cxx:6458 Change-Id: I7f48f76cacffa00d633d92f0a51b2d82f96d1e74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144592 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> (cherry picked from commit 21a2de9b5e5ae9be260456a10a7ba25a77e73b43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144611 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 1227d448a057..135938ae4dcd 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5609,6 +5609,11 @@ void DomainMapper_Impl::handleFieldAsk */ OUString DomainMapper_Impl::convertFieldFormula(const OUString& input) { + if (!m_pSettingsTable) + { + return input; + } + OUString listSeparator = m_pSettingsTable->GetListSeparator(); /* Replace logical condition functions with LO equivalent operators */
