diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-10-15 21:44:42 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-10-16 08:20:37 +0200 |
| commit | e042a83843ed2573dbce9338058b3dc545dd6898 (patch) | |
| tree | 77a73a5f1fd72f5af711a551e9c6984f2769465e | |
| parent | 35b0a64c3c8f11e15d689ecb5598b09c4459e5cd (diff) | |
writerfilter: sync layout-in-cell vs wrap-though behavior with ww8 import
I removed the same check in the WW8 import in commit
d630f69d90f15bc652a62648b05ea515de78d16a (Related: tdf#124601 DOC
import: improve fLayoutInCell handling, 2019-09-26). There is no reason
the DOCX import shouldn't do the same, just for consistency.
Change-Id: I9e56a3fcd0b13ba08e347fbc06b0960ac21b372c
Reviewed-on: https://gerrit.libreoffice.org/80856
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 131ff53d60a3..2e2ff9e4eec1 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1323,7 +1323,7 @@ uno::Reference<text::XTextContent> GraphicImport::createGraphicObject(uno::Refer } xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_SURROUND ), uno::makeAny(static_cast<sal_Int32>(m_pImpl->nWrap))); - if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell && m_pImpl->nWrap != text::WrapTextMode_THROUGH ) + if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell ) xGraphicObjectProperties->setPropertyValue(getPropertyName( PROP_FOLLOW_TEXT_FLOW ), uno::makeAny(true)); if( m_pImpl->rDomainMapper.IsInTable() && m_pImpl->bLayoutInCell ) |