diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-22 11:12:47 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2019-07-23 12:34:56 +0200 |
| commit | d9ed1f1ee34951f02985ec891b25a294b7e5d6c5 (patch) | |
| tree | c320f18b30a296624dee21d76508b0f57abc3b09 /writerfilter | |
| parent | 1f23e5dc4f5697e748ee5caad4142e01e5ffa3ef (diff) | |
MSForms: DOCX filter: fix crash when the date field is inside a shape
Change-Id: Ida6ff48e6e743e41dd793e31c11065f870e8959b
Reviewed-on: https://gerrit.libreoffice.org/76117
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit d163b651dc3dd017cdb3327d87a7cf88003238e9)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 95bd864fc63a..6a0095651ffd 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3248,11 +3248,12 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) m_pImpl->m_pSdtHelper->getLocale().truncate(); return; } - if((m_pImpl->hasTableManager() && m_pImpl->getTableManager().isInTable()) || - m_pImpl->m_nTableDepth > 0) + bool bIsInTable = (m_pImpl->hasTableManager() && m_pImpl->getTableManager().isInTable()) || + (m_pImpl->m_nTableDepth > 0); + if(bIsInTable || m_pImpl->IsInShape()) { - // Inside a table we need to import date field earlier - m_pImpl->m_pSdtHelper->createDateContentControl(true); + // Inside an object we need to import date field earlier + m_pImpl->m_pSdtHelper->createDateContentControl(bIsInTable); } } |