diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-07-08 21:25:44 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-07-09 09:08:36 +0200 |
| commit | 9a15a75dfa7ab8c5d51c411e0e39d68d22b7587a (patch) | |
| tree | f852db6f7128108e20179af2c60ec6f5b48fdcbb /writerfilter | |
| parent | 99e6eaf28c3cceb4fbf5292b255354dd1bdbe471 (diff) | |
tdf#126173 RTF import: fix lost SHAPE fields
Commit 5a5d55a8a0f82406a8001015a723596f21d3562c (fdo#82860 RTF import:
fix handling of SHAPE fields, 2014-10-15) already tried to handle this,
but aCode is the shape command + its parameters (SHAPE \* MERGEFORMAT)
for the bugdoc, while what we want is just the shape command.
The field variable already contains a tokenized version, which was used
previously only to decide if a field is unhandled or not.
Reuse that for the shape comparison, so bugdoc's shape with parameters
also appears.
Change-Id: I7e044b94bcfab490c956b33c11dd6c69443939f5
Reviewed-on: https://gerrit.libreoffice.org/75243
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 28b4fb20183d..e14e672aa816 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4885,7 +4885,7 @@ void DomainMapper_Impl::CloseFieldCommand() */ OUString aCode( pContext->GetCommand().trim() ); // Don't waste resources on wrapping shapes inside a fieldmark. - if (aCode != "SHAPE" && m_xTextFactory.is() && !m_aTextAppendStack.empty()) + if (std::get<0>(field) != "SHAPE" && m_xTextFactory.is() && !m_aTextAppendStack.empty()) { xFieldInterface = m_xTextFactory->createInstance("com.sun.star.text.Fieldmark"); const uno::Reference<text::XTextContent> xTextContent(xFieldInterface, uno::UNO_QUERY_THROW); |