diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-10-29 13:55:35 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-10-29 16:30:55 +0100 |
| commit | 40f801db20a2d0f7d842b8be039c47c3718d6686 (patch) | |
| tree | 555c3fb37fdac709c85d37583bc3f282a30a690e /writerfilter | |
| parent | 97196ddfea7bea9e6c22dcc722aaa2cdfff971e8 (diff) | |
writerfilter: need to always import form-fields with their ffData
The generic field import path ignores ffData, becuase it's a separate
element and not part of the field command.
Change-Id: Ie7c622aff01e4f1a63269b46aa7b06f4f18db8c4
Reviewed-on: https://gerrit.libreoffice.org/81670
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 49799c25ffc9..3ce2f1a37d04 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4423,10 +4423,14 @@ void DomainMapper_Impl::CloseFieldCommand() FieldConversionMap_t::const_iterator const aIt = aFieldConversionMap.find(std::get<0>(field)); - if (aIt != aFieldConversionMap.end() && !m_bForceGenericFields) + if (aIt != aFieldConversionMap.end() + && (!m_bForceGenericFields + // these need to convert ffData to properties... + || (aIt->second.eFieldId == FIELD_FORMCHECKBOX) + || (aIt->second.eFieldId == FIELD_FORMDROPDOWN) + || (aIt->second.eFieldId == FIELD_FORMTEXT))) { pContext->SetFieldId(aIt->second.eFieldId); - bool bCreateEnhancedField = false; uno::Reference< beans::XPropertySet > xFieldProperties; bool bCreateField = true; |