diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-12-16 10:43:07 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-12-19 09:28:46 +0000 |
| commit | 604f8c233c6543940d0c794223e24ac5d0749679 (patch) | |
| tree | fc8f721fcfb75bddb5ab9001539864d084d8ccf4 | |
| parent | fb584f373c3c683b602de43f2679a3e46fdf8b13 (diff) | |
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/+/144314
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 2f7fda4b1388..a3fba36fc39c 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -5300,6 +5300,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 */ |